diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-12-10 15:42:54 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-12-10 15:42:54 +0200 |
| commit | 0bd034c56a9e7dd09c406ff83c8b3a630e56ecbf (patch) | |
| tree | 36321d34b5805db1569aa9a22b548ca558360fb5 /indra | |
| parent | 96b8f71fa985d0e760d023fdd745dcd91a7dce6a (diff) | |
fixed EXT-3250 There should be no "Group info" button for Ad-hoc conference
caused by misdetection of IM type
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 40ae112e4b..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; } } } |