Automated merge with ssh://hg.lindenlab.com/richard/viewer-social/

2 files changed, 23 insertions, 1 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ea8b1c681d..88620e4193 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12531,5 +12531,16 @@
       <key>Value</key>

       <integer>1</integer>

     </map>

+    <key>ClickToWalk</key>

+    <map>

+      <key>Comment</key>

+      <string>Click in world to walk to location</string>

+      <key>Persist</key>

+      <integer>1</integer>

+      <key>Type</key>

+      <string>Boolean</string>

+      <key>Value</key>

+      <integer>0</integer>

+    </map>

 </map>

 </llsd>

diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml
index b5fb85c929..73c7c1e4bd 100644
--- a/indra/newview/app_settings/settings_minimal.xml
+++ b/indra/newview/app_settings/settings_minimal.xml
@@ -61,7 +61,7 @@
         <key>Type</key>
             <string>String</string>
         <key>Value</key>
-            <string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/damballah/howto/index.html</string>
+            <string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/damballah/howto/index.html?topic=[TOPIC]</string>
         </map>
     <key>PreferredMaturity</key>
         <map>
@@ -347,5 +347,16 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>ClickToWalk</key>
+    <map>
+      <key>Comment</key>
+      <string>Click in world to walk to location</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
   </map>
 </llsd>