diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-06-27 17:40:40 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-06-27 17:40:40 -0400 |
| commit | c9e00e7ae8aca545ae363b975b06753489e3d0b2 (patch) | |
| tree | fecd9cca920afab708a53067571afd5d4aae8ed5 /indra/newview | |
| parent | 1f234f8593cb556d6515b7bbf3ac99d19fa4c5c3 (diff) | |
| parent | fbbde138c42dfced9b8805e4ce774ae8605e9d9b (diff) | |
Automated merge with https://bitbucket.org/VirLinden/sunshine
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 11 | ||||
| -rwxr-xr-x | indra/newview/llstartup.cpp | 8 |
2 files changed, 19 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> diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index ebde7a55fe..e271653b2d 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -3442,6 +3442,14 @@ bool process_login_success_response() } + // set the location of the Agent Appearance service, from which we can request + // avatar baked textures if they are supported by the current region + std::string agent_appearance_url = response["agent_appearance_service"]; + if (!agent_appearance_url.empty()) + { + gSavedSettings.setString("AgentAppearanceServiceURL", agent_appearance_url); + } + // Set the location of the snapshot sharing config endpoint std::string snapshot_config_url = response["snapshot_config_url"]; if(!snapshot_config_url.empty()) |