diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-02 12:59:05 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-02 12:59:05 -0700 |
| commit | 3a0a28705817dc1b9a5f626b7a5aa247a06a8fc6 (patch) | |
| tree | e361bf5390a2b415d5eb285470016b75a124699e | |
| parent | 4d53e235c2445b820bb0ae7303b269648dd86037 (diff) | |
Patches follow merge to latest viewer-20 updates
| -rw-r--r-- | indra/llprimitive/tests/llmediaentry_test.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llstartup.cpp | 22 | ||||
| -rw-r--r-- | indra/newview/tests/llviewerhelputil_test.cpp | 3 |
3 files changed, 15 insertions, 12 deletions
diff --git a/indra/llprimitive/tests/llmediaentry_test.cpp b/indra/llprimitive/tests/llmediaentry_test.cpp index 72478d0459..9ce6560923 100644 --- a/indra/llprimitive/tests/llmediaentry_test.cpp +++ b/indra/llprimitive/tests/llmediaentry_test.cpp @@ -157,7 +157,7 @@ namespace tut void ensure_llsd_equals(const std::string& msg, const LLSD& expected, const LLSD& actual) { - if (! llsd_equals(expected, actual)) + if (!tut::llsd_equals(expected, actual)) { std::string message = msg; message += ": actual: "; diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 30ae9fcea1..dcec99a9d2 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1127,17 +1127,6 @@ bool idle_startup() // Don't pop up a notification in the TOS case because // LLFloaterTOS::onCancel() already scolded the user. if (reason_response != "tos") - // this is the base used to construct help URLs - text = LLUserAuth::getInstance()->getResponse("help_url_format"); - if (!text.empty()) - { - // replace the default help URL format - gSavedSettings.setString("HelpURLFormat",text); - - // don't fall back to Nebraska's pre-connection static help - gSavedSettings.setBOOL("HelpUseLocal", false); - } - { LLSD args; args["ERROR_MESSAGE"] = emsg.str(); @@ -2984,6 +2973,17 @@ bool process_login_success_response() } } + // this is the base used to construct help URLs + text = response["help_url_format"]; + if (!text.empty()) + { + // replace the default help URL format + gSavedSettings.setString("HelpURLFormat",text); + + // don't fall back to Nebraska's pre-connection static help + gSavedSettings.setBOOL("HelpUseLocal", false); + } + std::string home_location = response["home"]; if(!home_location.empty()) { diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp index 40f7d532bc..13e087021b 100644 --- a/indra/newview/tests/llviewerhelputil_test.cpp +++ b/indra/newview/tests/llviewerhelputil_test.cpp @@ -30,6 +30,9 @@ * COMPLETENESS OR PERFORMANCE. * $/LicenseInfo$ */ +// Precompiled header +#include "../Llviewerprecompiledheaders.h" + #include "../test/lltut.h" #include "../llviewerhelputil.h" |