aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-06-05 18:28:08 -0700
committerMcCabe Maxsted2009-06-05 18:28:08 -0700
commita96c9f533ee3ba29785abdd96177ee7ee4eeb861 (patch)
tree51e8a27203044652af3f2123201c26bac3dc39bf
parentMerged in Armin's gesture manager patch to compensate for removing 'Gestures'... (diff)
downloadmeta-impy-a96c9f533ee3ba29785abdd96177ee7ee4eeb861.zip
meta-impy-a96c9f533ee3ba29785abdd96177ee7ee4eeb861.tar.gz
meta-impy-a96c9f533ee3ba29785abdd96177ee7ee4eeb861.tar.bz2
meta-impy-a96c9f533ee3ba29785abdd96177ee7ee4eeb861.tar.xz
Menu bar now only changes color for Aditi
-rw-r--r--ChangeLog.txt4
-rw-r--r--linden/indra/newview/llviewernetwork.cpp9
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 46f51ac..07d6dc5 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -25,6 +25,10 @@
25 Merged in Armin's gesture manager patch to compensate 25 Merged in Armin's gesture manager patch to compensate
26 for removing 'Gestures' from the pie. 26 for removing 'Gestures' from the pie.
27 27
28
29 * linden/indra/newview/llviewernetwork.cpp:
30 Menu bar now only changes color for Aditi.
31
28 32
292009-04-28 McCabe Maxsted <hakushakukun@gmail.com> 332009-04-28 McCabe Maxsted <hakushakukun@gmail.com>
30 34
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index 9019b88..8c4be1f 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -253,10 +253,13 @@ bool LLViewerLogin::isInProductionGrid()
253 std::vector<std::string> uris; 253 std::vector<std::string> uris;
254 getLoginURIs(uris); 254 getLoginURIs(uris);
255 LLStringUtil::toLower(uris[0]); 255 LLStringUtil::toLower(uris[0]);
256 if((uris[0].find("agni") != std::string::npos)) 256
257 // Returns true for every grid but Aditi now,
258 // because opensim grids have feelings too! -- McCabe
259 if((uris[0].find("aditi") != std::string::npos))
257 { 260 {
258 return true; 261 return false;
259 } 262 }
260 263
261 return false; 264 return true;
262} 265}