diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-12-10 15:24:08 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-12-10 15:24:08 -0500 |
| commit | 623a06aabd9d7e5c7e74211360aa233ec33e4977 (patch) | |
| tree | 21c815db542e45fc07473cd26a24561c5f27add8 /indra/newview/llstartup.cpp | |
| parent | d56a98dea4c7523a759bea4740d8bdde1df15e30 (diff) | |
| parent | a9ada0cc6a1418da0908f995b1369912a270b22d (diff) | |
merge release tag
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()) { |