From c7f818d42ec4e2a2b8b27bfd4dbfaf4fc8beb7eb Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Fri, 11 Feb 2011 22:02:49 +1000
Subject: Comment out the server tellinsg us what the search URL is, seems the
 server sends garbage. Should revert this when the server is fixed.  Also
 explains why some viewers don't have working search.

---
 linden/indra/newview/llstartup.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 31647e9..72c3ccc 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1739,8 +1739,9 @@ bool idle_startup()
 			if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setRegisterUrl(tmp);
 			tmp = LLUserAuth::getInstance()->getResponse("password");
 			if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setPasswordUrl(tmp);
-			tmp = LLUserAuth::getInstance()->getResponse("search");
-			if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setSearchUrl(tmp);
+// meta7 TODO - comment this out for now, the server is sending spurious data.
+//			tmp = LLUserAuth::getInstance()->getResponse("search");
+//			if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setSearchUrl(tmp);
 			tmp = LLUserAuth::getInstance()->getResponse("currency");
 			if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setCurrencySymbol(tmp);
 			tmp = LLUserAuth::getInstance()->getResponse("real_currency");
-- 
cgit v1.1