summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-03-02 21:29:36 -0800
committerRichard Linden <none@none>2011-03-02 21:29:36 -0800
commit0e87f37161a7b8c5df4f27b0f3a491c3b6546f66 (patch)
tree6b31dbf4402e5ff61e9bb93b2925a9cd4833242b /indra/newview/app_settings
parent92403b4ea1c02d378a1157e8912f1e3976ba3772 (diff)
SOCIAL-623 FIX World map accessible from classified and picks in web profile in minimal skin
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml17
-rw-r--r--indra/newview/app_settings/settings_minimal.xml22
2 files changed, 36 insertions, 3 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 4fbef050ff..a2459890a1 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12435,7 +12435,7 @@
<key>EnableClassifieds</key>
<map>
<key>Comment</key>
- <string>Enable creation of new classified ads</string>
+ <string>Enable creation of new classified ads from web link</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -12446,7 +12446,7 @@
<key>EnableGroupInfo</key>
<map>
<key>Comment</key>
- <string>Enable viewing and editing of group info.</string>
+ <string>Enable viewing and editing of group info from web link</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -12457,7 +12457,18 @@
<key>EnablePicks</key>
<map>
<key>Comment</key>
- <string>Enable editing of picks</string>
+ <string>Enable editing of picks from web link</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>EnableWorldMap</key>
+ <map>
+ <key>Comment</key>
+ <string>Enable opening world map from web link</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml
index cd0fe9e892..d505d59ec9 100644
--- a/indra/newview/app_settings/settings_minimal.xml
+++ b/indra/newview/app_settings/settings_minimal.xml
@@ -259,6 +259,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>EnableWorldMap</key>
+ <map>
+ <key>Comment</key>
+ <string>Enable opening world map from web link</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>DoubleClickShowWorldMap</key>
<map>
<key>Comment</key>
@@ -270,5 +281,16 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>EnableGroupChatPopups</key>
+ <map>
+ <key>Comment</key>
+ <string>Enable Incoming Group Chat Popups</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
</map>
</llsd>