diff options
| author | Tess Chu <tess@lindenlab.com> | 2007-08-10 02:15:37 +0000 |
|---|---|---|
| committer | Tess Chu <tess@lindenlab.com> | 2007-08-10 02:15:37 +0000 |
| commit | 3b2515fd5ff832fa5faa5384b2c3db919d960509 (patch) | |
| tree | 0206223e8f0987dfe07c402c9ca99cee6685a849 /indra/newview/llviewermessage.cpp | |
| parent | 52cb2aea8667056671b67a3c70eeefd00a061751 (diff) | |
merge -r 66233:67472 svn+ssh://svn/svn/linden/branches/het-grid-4 Paired by Tess and Leyla.
Added tests to version manager and fixed failed tests. Paired by rdw and Tess.
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 7cf9ca9568..cbaa1e2f2e 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -64,6 +64,7 @@ #include "llfloatermute.h" #include "llfloaterpostcard.h" #include "llfloaterpreference.h" +#include "llfloaterreleasemsg.h" #include "llfollowcam.h" #include "llgroupnotify.h" #include "llhudeffect.h" @@ -2612,6 +2613,9 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**) msg->getVector3Fast(_PREHASH_Data, _PREHASH_LookAt, look_at); U64 region_handle; msg->getU64Fast(_PREHASH_Data, _PREHASH_RegionHandle, region_handle); + + char version_channel_char[MAX_STRING]; + msg->getString("SimData", "ChannelVersion", MAX_STRING, version_channel_char); LLVOAvatar* avatarp = gAgent.getAvatarObject(); if (!avatarp) @@ -2745,6 +2749,23 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**) msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID()); msg->addBOOLFast(_PREHASH_AlwaysRun, gAgent.getAlwaysRun()); gAgent.sendReliableMessage(); + + + LLString version_channel = LLString(version_channel_char); + + if (gLastVersionChannel != version_channel) + { + //show release message if not on initial login + if (!gLastVersionChannel.empty()) + { + gLastVersionChannel = version_channel; + LLFloaterReleaseMsg::show(); + } + else { + gLastVersionChannel = version_channel; + } + } + } void process_crossed_region(LLMessageSystem* msg, void**) |