diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-11-06 16:37:51 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-11-06 16:37:51 -0500 |
| commit | 55a812ca7797ec1b857e95254fde1fa75bd92d06 (patch) | |
| tree | c15fdb992af40162cc5adb3c25257f3ba1f069a1 /indra/newview/llstartup.cpp | |
| parent | bf6d1670756ba96abde570e7dbbf94c62c71ca5b (diff) | |
| parent | a9ea41003587e2411c7247f84ea04df2a686552b (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 42648b82c2..3d1fd74ba6 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -3307,11 +3307,8 @@ bool process_login_success_response() { // replace the default help URL format gSavedSettings.setString("HelpURLFormat",text); - - // don't fall back to Standalone's pre-connection static help - gSavedSettings.setBOOL("HelpUseLocal", false); } - + std::string home_location = response["home"]; if(!home_location.empty()) { |