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

Fix recursive call to LLNotifications::initSingleton

Browse Source
This commit is contained in:
Aleric Inglewood
2013-03-19 19:56:20 +01:00
parent 7de15e7acd
commit fc642019b3
9 changed files with 139 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llviewermessage.cpp
View File

@@ -6149,7 +6149,7 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
// notification was specified using the new mechanism, so we can just handle it here
std::string notificationID;
msgsystem->getStringFast(_PREHASH_AlertInfo, _PREHASH_Message, notificationID);
if (!LLNotifications::getInstance()->templateExists(notificationID))
if (!LLNotificationTemplates::getInstance()->templateExists(notificationID))
{
return false;
}
@@ -6327,7 +6327,7 @@ void process_alert_core(const std::string& message, BOOL modal)
}
else
{
std::string new_msg =LLNotifications::instance().getGlobalString(text);
std::string new_msg =LLNotificationTemplates::instance().getGlobalString(text);
args["MESSAGE"] = new_msg;
LLNotificationsUtil::add("SystemMessage", args);
}
@@ -6335,7 +6335,7 @@ void process_alert_core(const std::string& message, BOOL modal)
else if (modal)
{
LLSD args;
std::string new_msg =LLNotifications::instance().getGlobalString(message);
std::string new_msg =LLNotificationTemplates::instance().getGlobalString(message);
args["ERROR_MESSAGE"] = new_msg;
LLNotificationsUtil::add("ErrorMessage", args);
}
@@ -6346,7 +6346,7 @@ void process_alert_core(const std::string& message, BOOL modal)
if (message.find(AUTOPILOT_CANCELED_MSG) == std::string::npos )
{
LLSD args;
std::string new_msg =LLNotifications::instance().getGlobalString(message);
std::string new_msg =LLNotificationTemplates::instance().getGlobalString(message);
std::string localized_msg;
bool is_message_localized = LLTrans::findString(localized_msg, new_msg);