Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer include llerrorlegacy.h. Updated llstl to include deletion utilites.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 03:54:20 -05:00
parent 283f5298d5
commit 1c627317ec
634 changed files with 8200 additions and 12214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llui/llalertdialog.cpp
View File

@@ -186,7 +186,7 @@ LLAlertDialog::LLAlertDialog( LLNotificationPtr notification, bool modal)
// Message: create text box using raw string, as text has been structure deliberately
// Use size of created text box to generate dialog box size
std::string msg = mNote->getMessage();
llwarns << "Alert: " << msg << llendl;
LL_WARNS() << "Alert: " << msg << LL_ENDL;
LLTextBox* msg_box = new LLTextBox( std::string("Alert message"), msg, (F32)MAX_ALLOWED_MSG_WIDTH, font );
const LLRect& text_rect = msg_box->getRect();
@@ -504,7 +504,7 @@ void LLAlertDialog::setEditTextArgs(const LLSD& edit_args)
}
else
{
llwarns << "LLAlertDialog::setEditTextArgs called on dialog with no line editor" << llendl;
LL_WARNS() << "LLAlertDialog::setEditTextArgs called on dialog with no line editor" << LL_ENDL;
}
}