From bebdf803c4b43078bd09d174d6a19e7baba4e0ef Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 1 Mar 2011 18:26:57 -0800
Subject: remove [GRID] string replacement as it didn't work
---
indra/newview/app_settings/settings.xml | 4 ++--
indra/newview/llviewernetwork.cpp | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6d988e16e4..4fbef050ff 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -617,7 +617,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/[GRID]/avatars.html</string>
+ <string>http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/avatars.html</string>
</map>
<key>AvatarBakedTextureUploadTimeout</key>
<map>
@@ -2566,7 +2566,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/[GRID]/guide.html</string>
+ <string>http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/guide.html</string>
</map>
<key>DisableCameraConstraints</key>
<map>
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp
index a72dcc8885..a59afdc28a 100644
--- a/indra/newview/llviewernetwork.cpp
+++ b/indra/newview/llviewernetwork.cpp
@@ -506,7 +506,6 @@ void LLGridManager::setGridChoice(const std::string& grid)
}
mGrid = grid;
gSavedSettings.setString("CurrentGrid", grid);
- LLTrans::setDefaultArg("GRID", mGrid);
updateIsInProductionGrid();
}
--
cgit v1.2.3