diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2008-01-23 01:03:39 +0000 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2008-01-23 01:03:39 +0000 |
| commit | 9dab86f4cf4d6fa1135bb8dc23ec40c89d5fa022 (patch) | |
| tree | 2c858fd15faea98b6a6d334509595578588676b0 | |
| parent | aa10b000278affd5fa4714e73b6fe21fdaa4ea65 (diff) | |
DEV-8923: info window does not pop up when transitioning from a Havok1 to Havok4 region
reviewed by tess
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 17 | ||||
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 8 |
2 files changed, 10 insertions, 15 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 2e799039ab..9332a909d7 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -50,6 +50,7 @@ #include "llfloaterimport.h" #include "llfocusmgr.h" #include "llfollowcamparams.h" +#include "llfloaterreleasemsg.h" #include "llinstantmessage.h" #include "llquantize.h" #include "llregionflags.h" @@ -2847,21 +2848,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**) 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; - } - } + LLFloaterReleaseMsg::displayMessage(version_channel_char); } diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index ef4ae7652c..46f9c46a31 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -50,6 +50,7 @@ #include "lldir.h" #include "lleventpoll.h" #include "llfloatergodtools.h" +#include "llfloaterreleasemsg.h" #include "llfloaterreporter.h" #include "llfloaterregioninfo.h" #include "llhttpnode.h" @@ -1308,6 +1309,13 @@ public: mRegion->setCapability(iter->first, iter->second); llinfos << "BaseCapabilitiesComplete::result got capability for " << iter->first << llendl; + + /* HACK we're waiting for the ServerReleaseNotes */ + if ((iter->first == "ServerReleaseNotes") && (LLFloaterReleaseMsg::sDisplayMessage)) + { + LLFloaterReleaseMsg::show(); + LLFloaterReleaseMsg::sDisplayMessage = false; + } } if (STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState()) |