From bed1ec4525f0bcfe634c4677feb29dbbdc3442c8 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Fri, 25 Dec 2009 22:21:58 +0200
Subject: [PATCH] Fixed minor bug EXT-2929 ([BSI] Context menu on chiclets
should not have "show session" enabled when chiclet window is visible).
--HG--
branch : product-engine
---
indra/newview/llchiclet.cpp | 18 +++++++++++++++++-
indra/newview/llchiclet.h | 6 ++++++
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index 2719f10a3dc..660018530f2 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -722,8 +722,11 @@ void LLIMP2PChiclet::updateMenuItems()
if(getSessionId().isNull())
return;
+ LLIMFloater* open_im_floater = LLIMFloater::findInstance(getSessionId());
+ bool open_window_exists = open_im_floater && open_im_floater->getVisible();
+ mPopupMenu->getChild<LLUICtrl>("Send IM")->setEnabled(!open_window_exists);
+
bool is_friend = LLAvatarActions::isFriend(getOtherParticipantId());
-
mPopupMenu->getChild<LLUICtrl>("Add Friend")->setEnabled(!is_friend);
}
@@ -1067,6 +1070,18 @@ void LLIMGroupChiclet::changed(LLGroupChange gc)
}
}
+void LLIMGroupChiclet::updateMenuItems()
+{
+ if(!mPopupMenu)
+ return;
+ if(getSessionId().isNull())
+ return;
+
+ LLIMFloater* open_im_floater = LLIMFloater::findInstance(getSessionId());
+ bool open_window_exists = open_im_floater && open_im_floater->getVisible();
+ mPopupMenu->getChild<LLUICtrl>("Chat")->setEnabled(!open_window_exists);
+}
+
BOOL LLIMGroupChiclet::handleRightMouseDown(S32 x, S32 y, MASK mask)
{
if(!mPopupMenu)
@@ -1076,6 +1091,7 @@ BOOL LLIMGroupChiclet::handleRightMouseDown(S32 x, S32 y, MASK mask)
if (mPopupMenu)
{
+ updateMenuItems();
mPopupMenu->arrangeAndClear();
LLMenuGL::showPopup(this, mPopupMenu, x, y);
}
diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index 511b85b0b62..8c797ef98fa 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -521,6 +521,7 @@ class LLIMP2PChiclet : public LLIMChiclet
/**
* Enables/disables menus based on relationship with other participant.
+ * Enables/disables "show session" menu item depending on visible IM floater existence.
*/
virtual void updateMenuItems();
@@ -751,6 +752,11 @@ class LLIMGroupChiclet : public LLIMChiclet, public LLGroupMgrObserver
*/
virtual void onMenuItemClicked(const LLSD& user_data);
+ /**
+ * Enables/disables "show session" menu item depending on visible IM floater existence.
+ */
+ virtual void updateMenuItems();
+
/**
* Displays popup menu.
*/
--
GitLab