diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-11 13:37:00 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-11 13:37:00 -0500 |
| commit | f042f35381f961e5648c239ae9dbf4b40941e96e (patch) | |
| tree | b713281f53c9c0e291b996731684b41e3b3bc1c5 /indra/newview/llimfloater.cpp | |
| parent | ea3b99614327404f15f8c0cf98ae6d61bdd4572b (diff) | |
| parent | c74d5c483cbd75c5e2a0b17c8980755a9932c53a (diff) | |
Merge of viewer2 into avp branch
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llimfloater.cpp')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 2bc07d0c27..47a168e354 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -90,8 +90,20 @@ LLIMFloater::LLIMFloater(const LLUUID& session_id) case IM_SESSION_CONFERENCE_START: mFactoryMap["panel_im_control_panel"] = LLCallbackMap(createPanelAdHocControl, this); break; - default: + case IM_SESSION_GROUP_START: mFactoryMap["panel_im_control_panel"] = LLCallbackMap(createPanelGroupControl, this); + break; + case IM_SESSION_INVITE: + if (gAgent.isInGroup(mSessionID)) + { + mFactoryMap["panel_im_control_panel"] = LLCallbackMap(createPanelGroupControl, this); + } + else + { + mFactoryMap["panel_im_control_panel"] = LLCallbackMap(createPanelAdHocControl, this); + } + break; + default: break; } } } @@ -415,6 +427,7 @@ void LLIMFloater::setDocked(bool docked, bool pop_on_undock) if(channel) { channel->updateShowToastsState(); + channel->redrawToasts(); } } @@ -439,6 +452,7 @@ void LLIMFloater::setVisible(BOOL visible) if(channel) { channel->updateShowToastsState(); + channel->redrawToasts(); } if (visible && mChatHistory && mInputEditor) |