From fdddd37db095dbbefb17b1725db5fb9527ba3fd9 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 10 Oct 2012 17:18:26 -0400
Subject: Remove HelpUseLocal setting variable. Hide local html skin dir. We
 assert that the local html directory is no longer used. Remove machinery
 related to its use, notably HelpUseLocal, the code that checks it and the
 code that sets and examines special flag URL "__local". Before actually
 killing off the local skins/default/html directory, make viewer_manifest.py
 rename it but continue packaging it as html.old. If this doesn't cause a
 panic, we can proceed with removing it entirely.

---
 indra/newview/app_settings/settings.xml | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 1bf773bb9e..318a18912a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4040,17 +4040,6 @@
       <key>Value</key>
       <integer>305</integer>
     </map>
-    <key>HelpUseLocal</key>
-    <map>
-      <key>Comment</key>
-      <string>If set, always use this for help: skins/default/html/[LANGUAGE]/help-offline/index.html</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>HelpURLFormat</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From c5373b90eb2de8f29be6801a07e937064ecb7fbb Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 15 Oct 2012 16:16:24 -0400
Subject: Add 'sourceid' settings var specifically for skin-files insertion.
 Add logic after (both!) LLTransUtil::parseStrings() calls to ensure that
 "[sourceid]" embedded in (e.g.) strings.xml content will be replaced.

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 5e50bd6e01..89f300548e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12285,6 +12285,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>sourceid</key>
+    <map>
+      <key>Comment</key>
+      <string>Identify referring agency to Linden web servers</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string />
+    </map>
     <key>SpeakerParticipantDefaultOrder</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From a36b66bd145e99a8f597f1c7c3b48ca30bdd7029 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 7 Nov 2012 16:03:54 -0600
Subject: MAINT-1815 Fix for excessive memory usage in Mayfair.  Disable
 tcmalloc.  Disable private memory pools.  Make viewer large address aware on
 windows.

Reviewed by Kelly
---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 1bf773bb9e..46f2453726 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5755,7 +5755,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>MemoryPrivatePoolSize</key>
     <map>
-- 
cgit v1.2.3