diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-06 09:53:57 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-06 09:53:57 -0500 |
| commit | b3e34545a4d37444a2def3462d75e185df5535d0 (patch) | |
| tree | f4a09ef60040db8399528a7f3564b5d265b3e22a /indra/newview/app_settings/settings.xml | |
| parent | 7b0b5726dd2fcf5b79ed1b112891655fad0f96eb (diff) | |
| parent | 54cdc322b8f2bd35b289cacf3493622e7cc51194 (diff) | |
merge
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 215fcf4eab..089bc7d4cd 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -71,17 +71,6 @@ <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> @@ -1949,6 +1938,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>DebugAvatarAppearanceServiceURLOverride</key> + <map> + <key>Comment</key> + <string>URL to use for baked texture requests; overrides value returned by login server.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string /> + </map> <key>DebugAvatarRezTime</key> <map> <key>Comment</key> |