From 63285a20395497bfe98a863ae244ca078abbe951 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Wed, 15 Jun 2011 04:24:57 +0200 Subject: [PATCH] Mini-fixes --- indra/llui/llnotifications.cpp | 7 ++++++- indra/plugins/webkit/linux_volume_catcher.cpp | 5 +---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index 9348cc7e8..fd46d90c3 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -607,7 +607,12 @@ void LLNotification::init(const std::string& template_name, const LLSD& form_ele // add default substitutions // TODO: change this to read from the translatable strings file! - mSubstitutions["[SECOND_LIFE]"] = "Second Life"; + if (gHippoGridManager->getConnectedGrid()->isSecondLife()) { + mSubstitutions["[SECOND_LIFE]"] = "Second Life"; + } + else { + mSubstitutions["[SECOND_LIFE]"] = gHippoGridManager->getConnectedGrid()->getGridName(); + } mSubstitutions["[VIEWER_NAME]"] = LLNotifications::instance().getGlobalString("VIEWER_NAME"); mSubstitutions["[VIEWER_SITE]"] = LLNotifications::instance().getGlobalString("VIEWER_SITE"); diff --git a/indra/plugins/webkit/linux_volume_catcher.cpp b/indra/plugins/webkit/linux_volume_catcher.cpp index 0fdd3be3d..9e4880ed0 100644 --- a/indra/plugins/webkit/linux_volume_catcher.cpp +++ b/indra/plugins/webkit/linux_volume_catcher.cpp @@ -132,10 +132,7 @@ void ungrab_pa_syms() sSymPADSOHandleG = NULL; } - if ( sSymPADSOMemoryPool ) - { - sSymPADSOMemoryPool.destroy(); - } + sSymPADSOMemoryPool.destroy(); // NULL-out all of the symbols we'd grabbed #define LL_PA_SYM(REQUIRED, PASYM, RTN, ...) do{ll##PASYM = NULL;}while(0)