diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2010-12-28 14:30:52 +0200 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2010-12-28 14:30:52 +0200 |
| commit | d790003055a0b2127278715ae94c8261b95f3f15 (patch) | |
| tree | 9f8aa745c55ecba3d7dc5f81f1b0422f07e9e897 | |
| parent | 4d296c19e55b779051984d8d4dd3df780e768317 (diff) | |
STORM-242 ADDITIONAL_FIX Fixed release build and error handling.
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 5e198a7578..88c841468b 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -189,9 +189,11 @@ static bool parse_version_info(const std::string& version_info, std::string& cha { return false; } + + return true; } - return true; + return false; } bool friendship_offer_callback(const LLSD& notification, const LLSD& response) @@ -3854,7 +3856,11 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**) // The capability hasn't arrived yet or is not supported, // fall back to parsing server version channel. std::string channel, ver; - llassert(parse_version_info(version_channel, channel, ver) == true); + if (!parse_version_info(version_channel, channel, ver)) + { + llwarns << "Failed to parse server version channel (" << version_channel << ")" << llendl; + } + url = gSavedSettings.getString("ReleaseNotesURL"); LLSD args; args["CHANNEL"] = LLWeb::escapeURL(channel); |