aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llstartup.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 993e6e2..3698ecb 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -885,6 +885,7 @@ bool idle_startup()
885 } 885 }
886 886
887 gHippoGridManager->setCurrentGridAsConnected(); 887 gHippoGridManager->setCurrentGridAsConnected();
888 gHippoLimits->setLimits();
888 // create necessary directories 889 // create necessary directories
889 // *FIX: these mkdir's should error check 890 // *FIX: these mkdir's should error check
890 gDirUtilp->setLindenUserDir(gHippoGridManager->getCurrentGridNick(), firstname, lastname); 891 gDirUtilp->setLindenUserDir(gHippoGridManager->getCurrentGridNick(), firstname, lastname);
@@ -1650,13 +1651,14 @@ bool idle_startup()
1650 if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setPasswordUrl(tmp); 1651 if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setPasswordUrl(tmp);
1651 tmp = LLUserAuth::getInstance()->getResponse("search"); 1652 tmp = LLUserAuth::getInstance()->getResponse("search");
1652 if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setSearchUrl(tmp); 1653 if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setSearchUrl(tmp);
1653 tmp = LLUserAuth::getInstance()->getResponse("currency"); 1654 tmp = LLUserAuth::getInstance()->getResponse("currency");
1654 if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setCurrencySymbol(tmp); 1655 if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setCurrencySymbol(tmp);
1655 tmp = LLUserAuth::getInstance()->getResponse("real_currency"); 1656 tmp = LLUserAuth::getInstance()->getResponse("real_currency");
1656 if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setRealCurrencySymbol(tmp); 1657 if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setRealCurrencySymbol(tmp);
1657 tmp = LLUserAuth::getInstance()->getResponse("directory_fee"); 1658 tmp = LLUserAuth::getInstance()->getResponse("directory_fee");
1658 if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setDirectoryFee(atoi(tmp.c_str())); 1659 if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setDirectoryFee(atoi(tmp.c_str()));
1659 gHippoGridManager->saveFile(); 1660 gHippoGridManager->saveFile();
1661 gHippoLimits->setLimits();
1660 1662
1661 // JC: gesture loading done below, when we have an asset system 1663 // JC: gesture loading done below, when we have an asset system
1662 // in place. Don't delete/clear user_credentials until then. 1664 // in place. Don't delete/clear user_credentials until then.