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

Mini-fixes

Browse Source
This commit is contained in:
Siana Gearz
2011-06-15 04:24:57 +02:00
parent e7ed9b5b91
commit 63285a2039
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/llui/llnotifications.cpp
View File

@@ -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");

5
indra/plugins/webkit/linux_volume_catcher.cpp
View File

@@ -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)