diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-10-26 13:05:54 -0700 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-26 13:05:54 -0700 |
| commit | 1d67a9084199910d35a44ac427a07fc1d9d6a4fd (patch) | |
| tree | 4d942a13d1fd358a8a10a67554ea9a85b7f04c6f /indra/newview/llchannelmanager.cpp | |
| parent | 19fc3fb32c3cd95fcfb5708b59b5620e506c5179 (diff) | |
| parent | e84ff39e4c7c5b028a6b8b4f6dc5d37c525eb1c4 (diff) | |
merge with remote repo
Diffstat (limited to 'indra/newview/llchannelmanager.cpp')
| -rw-r--r-- | indra/newview/llchannelmanager.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/indra/newview/llchannelmanager.cpp b/indra/newview/llchannelmanager.cpp index c4619dc57a..77f941eef0 100644 --- a/indra/newview/llchannelmanager.cpp +++ b/indra/newview/llchannelmanager.cpp @@ -39,6 +39,7 @@ #include "llimview.h" #include "llbottomtray.h" #include "llviewerwindow.h" +#include "llrootview.h" #include <algorithm> @@ -121,6 +122,8 @@ void LLChannelManager::onLoginCompleted() return; } + gViewerWindow->getRootView()->addChild(mStartUpChannel); + // init channel's position and size S32 channel_right_bound = gViewerWindow->getWorldViewRect().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); S32 channel_width = gSavedSettings.getS32("NotifyBoxWidth"); @@ -128,7 +131,7 @@ void LLChannelManager::onLoginCompleted() mStartUpChannel->setShowToasts(true); mStartUpChannel->setCommitCallback(boost::bind(&LLChannelManager::onStartUpToastClose, this)); - mStartUpChannel->createStartUpToast(away_notifications, gSavedSettings.getS32("ChannelBottomPanelMargin"), gSavedSettings.getS32("StartUpToastTime")); + mStartUpChannel->createStartUpToast(away_notifications, gSavedSettings.getS32("StartUpToastLifeTime")); } //-------------------------------------------------------------------------- @@ -139,19 +142,11 @@ void LLChannelManager::onStartUpToastClose() mStartUpChannel->setVisible(FALSE); mStartUpChannel->closeStartUpToast(); removeChannelByID(LLUUID(gSavedSettings.getString("StartUpChannelUUID"))); - delete mStartUpChannel; mStartUpChannel = NULL; } // set StartUp Toast Flag to allow all other channels to show incoming toasts LLScreenChannel::setStartUpToastShown(); - - // force NEARBY CHAT CHANNEL to repost all toasts if present - //LLScreenChannelBase* nearby_channel = findChannelByID(LLUUID(gSavedSettings.getString("NearByChatChannelUUID"))); - //!!!!!!!!!!!!!! - //FIXME - //nearby_channel->loadStoredToastsToChannel(); - //nearby_channel->setCanStoreToasts(false); } //-------------------------------------------------------------------------- |