From f1c4c9d237eacfa68dbd3edf3f43d68941b55ce5 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 10 May 2011 17:11:05 -0700 Subject: EXP-806 FIX Server-side messages without a corresponding notification should show original, untranslated content --- indra/newview/llviewermessage.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index ef5968a5e2..fc11cbc28a 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -5366,6 +5366,12 @@ 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)) + { + return false; + } + std::string llsdRaw; LLSD llsdBlock; msgsystem->getStringFast(_PREHASH_AlertInfo, _PREHASH_Message, notificationID); -- cgit v1.2.3 From 9dbc3301f677316be3266caa792517f235438e81 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Wed, 11 May 2011 13:14:48 -0700 Subject: EXP-809 FIX Make Script Warning/Error window scrolling behavior match that of Chat history --- indra/newview/skins/default/xui/en/floater_script_debug_panel.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml index d1db5c17ba..ce96ea232e 100644 --- a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml @@ -20,5 +20,6 @@ parse_highlights="true" read_only="true" width="420" + track_bottom="true" word_wrap="true" /> -- cgit v1.2.3 From a0267151c3f4bfcf04dd02b81eb8450fc86c7791 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Wed, 11 May 2011 16:43:42 -0700 Subject: EXP-813 FIX Login screen reloads when clicking on location slapp --- indra/newview/llpanellogin.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 4ac3a248d3..27f341b4f6 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -769,7 +769,10 @@ void LLPanelLogin::loadLoginPage() gViewerWindow->setMenuBackgroundColor(false, !LLGridManager::getInstance()->isInProductionGrid()); LLMediaCtrl* web_browser = sInstance->getChild("login_html"); - web_browser->navigateTo( oStr.str(), "text/html" ); + if (web_browser->getCurrentNavUrl() != oStr.str()) + { + web_browser->navigateTo( oStr.str(), "text/html" ); + } } void LLPanelLogin::handleMediaEvent(LLPluginClassMedia* /*self*/, EMediaEvent event) -- cgit v1.2.3