diff options
| author | Richard Nelson <none@none> | 2010-07-20 11:31:23 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-07-20 11:31:23 -0700 |
| commit | 572e72d8a1cb777b0d60cdfa389f3e397a652da9 (patch) | |
| tree | c9e7f05654525d3a5ed2d89267462f92b5e8fd6f /indra/newview/llstartup.cpp | |
| parent | 4bd450737bf1f5a74a4857932235d7bcbead1388 (diff) | |
| parent | 67fb58847981f69cb31c34d7141165ba3f49aef6 (diff) | |
merge
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 96088fed9c..1ee73034f6 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -128,7 +128,6 @@ #include "llfloaterevent.h" #include "llpanelclassified.h" #include "llpanelpick.h" -#include "llpanelplace.h" #include "llpanelgrouplandmoney.h" #include "llpanelgroupnotices.h" #include "llpreview.h" @@ -3148,6 +3147,13 @@ bool process_login_success_response() } } + // Set the location of the snapshot sharing config endpoint + std::string snapshot_config_url = response["snapshot_config_url"]; + if(!snapshot_config_url.empty()) + { + gSavedSettings.setString("SnapshotConfigURL", snapshot_config_url); + } + // Start the process of fetching the OpenID session cookie for this user login std::string openid_url = response["openid_url"]; if(!openid_url.empty()) |