summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2012-06-27 17:40:40 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2012-06-27 17:40:40 -0400
commitc9e00e7ae8aca545ae363b975b06753489e3d0b2 (patch)
treefecd9cca920afab708a53067571afd5d4aae8ed5 /indra/newview/app_settings
parent1f234f8593cb556d6515b7bbf3ac99d19fa4c5c3 (diff)
parentfbbde138c42dfced9b8805e4ce774ae8605e9d9b (diff)
Automated merge with https://bitbucket.org/VirLinden/sunshine
Diffstat (limited to 'indra/newview/app_settings')
-rwxr-xr-xindra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 2a147a47f7..1792fae973 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -71,6 +71,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>AgentAppearanceServiceURL</key>
+ <map>
+ <key>Comment</key>
+ <string>Current Session Agent Appearance Service URL</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string></string>
+ </map>
<key>AlertedUnsupportedHardware</key>
<map>
<key>Comment</key>