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

Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

Browse Source
This commit is contained in:
Lirusaito
2012-01-11 02:28:14 -05:00
parent c5d4ccc78d ced937cc46
commit 8543106f5e
31 changed files with 504 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llstartup.cpp
View File

@@ -991,7 +991,13 @@ bool idle_startup()
gHippoGridManager->setCurrentGridAsConnected();
gHippoLimits->setLimits();
LLTrans::setDefaultArg("CURRENCY",gHippoGridManager->getConnectedGrid()->getCurrencySymbol()); //replace [CURRENCY] with OS$, not L$ for instance.
if(!gHippoGridManager->getConnectedGrid()->isSecondLife())
{
LLTrans::setDefaultArg("[CURRENCY]",gHippoGridManager->getConnectedGrid()->getCurrencySymbol()); //replace [CURRENCY] with OS$, not L$ for instance.
LLTrans::setDefaultArg("[SECOND_LIFE]", gHippoGridManager->getConnectedGrid()->getGridName());
LLTrans::setDefaultArg("[SECOND_LIFE_GRID]", gHippoGridManager->getConnectedGrid()->getGridName() + " Grid");
LLTrans::setDefaultArg("[GRID_OWNER]", gHippoGridManager->getConnectedGrid()->getGridOwner());
}
// create necessary directories
// *FIX: these mkdir's should error check