Added ClientTagsListURL debug setting.

URL to download client tags from.

3 files changed, 38 insertions, 10 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index a9044a4..ebdf0b7 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -5,6 +5,13 @@
 
 2010-02-27  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+        * Added ClientTagsListURL debug setting.
+          URL to download client tags from.
+
+          modified:   linden/indra/newview/app_settings/setings.xml
+          modified:   linden/indra/newview/llvoavatar.cpp
+
+
         * Bumped version to 1.3.0 beta 1.
 
           modified:   linden/indra/llcommon/llversionviewer.h
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 9fea0d8..036b751 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -15,6 +15,7 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+
   <key>DownloadClientTags</key>
   <map>
     <key>Comment</key>
@@ -26,6 +27,19 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+
+  <key>ClientTagsListURL</key>
+  <map>
+    <key>Comment</key>
+    <string>Location to download client tags list.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>http://imprudenceviewer.org/app/client_list/</string>
+  </map>
+
   <key>WarnClientTags</key>
   <map>
     <key>Comment</key>
@@ -37,6 +51,7 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+
   <key>ClothingLayerProtection</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 883d32f..64e6cd7 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3023,18 +3023,24 @@ void LLVOAvatar::idleUpdateWindEffect()
 bool LLVOAvatar::updateClientTags()
 {
         std::string client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "client_list.xml");
-        LLSD response = LLHTTPClient::blockingGet("http://www.imprudenceviewer.org/app/client_list/client_list.xml");
-        if(response.has("body"))
-        {
-                const LLSD &client_list = response["body"];
 
-                if(client_list.has("isComplete"))
+        std::string url = gSavedSettings.getString("ClientTagsListURL");
+
+        if(!url.empty())
+        {
+                LLSD response = LLHTTPClient::blockingGet(url);
+                if(response.has("body"))
                 {
-                        llofstream export_file;
-                        export_file.open(client_list_filename);
-                        LLSDSerialize::toPrettyXML(client_list, export_file);
-                        export_file.close();
-                        return true;
+                        const LLSD &client_list = response["body"];
+
+                        if(client_list.has("isComplete"))
+                        {
+                                llofstream export_file;
+                                export_file.open(client_list_filename);
+                                LLSDSerialize::toPrettyXML(client_list, export_file);
+                                export_file.close();
+                                return true;
+                        }
                 }
         }
         return false;