From d790003055a0b2127278715ae94c8261b95f3f15 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Tue, 28 Dec 2010 14:30:52 +0200
Subject: [PATCH] STORM-242 ADDITIONAL_FIX Fixed release build and error
handling.
---
indra/newview/llviewermessage.cpp | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 5e198a75788..88c841468b7 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);
--
GitLab