aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Seikel2011-02-12 12:04:24 +1000
committerDavid Seikel2011-02-12 12:04:24 +1000
commit2bae51cc8fb622bc4a05e2fd0ea7fde226d3424f (patch)
treedc14d442dc08a735c8c43b17e726308a34e98406
parentComment out the server tellinsg us what the search URL is, seems the server s... (diff)
downloadmeta-impy-2bae51cc8fb622bc4a05e2fd0ea7fde226d3424f.zip
meta-impy-2bae51cc8fb622bc4a05e2fd0ea7fde226d3424f.tar.gz
meta-impy-2bae51cc8fb622bc4a05e2fd0ea7fde226d3424f.tar.bz2
meta-impy-2bae51cc8fb622bc4a05e2fd0ea7fde226d3424f.tar.xz
Revert "Comment out the server tellinsg us what the search URL is, seems the server sends garbage."
This reverts commit c7f818d42ec4e2a2b8b27bfd4dbfaf4fc8beb7eb. The server is now fixed.
-rw-r--r--linden/indra/newview/llstartup.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 72c3ccc..31647e9 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1739,9 +1739,8 @@ bool idle_startup()
1739 if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setRegisterUrl(tmp); 1739 if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setRegisterUrl(tmp);
1740 tmp = LLUserAuth::getInstance()->getResponse("password"); 1740 tmp = LLUserAuth::getInstance()->getResponse("password");
1741 if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setPasswordUrl(tmp); 1741 if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setPasswordUrl(tmp);
1742// meta7 TODO - comment this out for now, the server is sending spurious data. 1742 tmp = LLUserAuth::getInstance()->getResponse("search");
1743// tmp = LLUserAuth::getInstance()->getResponse("search"); 1743 if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setSearchUrl(tmp);
1744// if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setSearchUrl(tmp);
1745 tmp = LLUserAuth::getInstance()->getResponse("currency"); 1744 tmp = LLUserAuth::getInstance()->getResponse("currency");
1746 if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setCurrencySymbol(tmp); 1745 if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setCurrencySymbol(tmp);
1747 tmp = LLUserAuth::getInstance()->getResponse("real_currency"); 1746 tmp = LLUserAuth::getInstance()->getResponse("real_currency");