EXT-1283 [Inspectors] Avatar gear menu does not dismiss when selecting another AV

reviewed by James

2 files changed, 14 insertions, 0 deletions

diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp
index 9b75c15597..fd301505cd 100644
--- a/indra/newview/llinspectavatar.cpp
+++ b/indra/newview/llinspectavatar.cpp
@@ -51,6 +51,7 @@
 #include "llcontrol.h"	// LLCachedControl
 #include "llfloater.h"
 #include "llfloaterreg.h"
+#include "llmenubutton.h"
 #include "lltooltip.h"	// positionViewNearMouse()
 #include "lluictrl.h"
 
@@ -80,6 +81,9 @@ public:
 	// Because floater is single instance, need to re-parse data on each spawn
 	// (for example, inspector about same avatar but in different position)
 	/*virtual*/ void onOpen(const LLSD& avatar_id);
+
+	// When closing they should close their gear menu 
+	/*virtual*/ void onClose();
 	
 	// Inspectors close themselves when they lose focus
 	/*virtual*/ void onFocusLost();
@@ -224,6 +228,8 @@ BOOL LLInspectAvatar::postBuild(void)
 	getChild<LLUICtrl>("volume_slider")->setCommitCallback(
 		boost::bind(&LLInspectAvatar::onVolumeChange, this, _2));
 
+	mCloseSignal.connect(boost::bind(&LLInspectAvatar::onClose, this));
+
 	return TRUE;
 }
 
@@ -288,6 +294,11 @@ void LLInspectAvatar::onOpen(const LLSD& data)
 	updateVolumeSlider();
 }
 
+void LLInspectAvatar::onClose()
+{  
+  getChild<LLMenuButton>("gear_btn")->hideMenu();
+}	
+
 //virtual
 void LLInspectAvatar::onFocusLost()
 {
diff --git a/indra/newview/llinspectobject.cpp b/indra/newview/llinspectobject.cpp
index b0e6273c41..1a88bcb8f0 100644
--- a/indra/newview/llinspectobject.cpp
+++ b/indra/newview/llinspectobject.cpp
@@ -46,6 +46,7 @@
 #include "llcontrol.h"			// LLCachedControl
 #include "llfloater.h"
 #include "llfloaterreg.h"
+#include "llmenubutton.h"
 #include "llresmgr.h"			// getMonetaryString
 #include "llsafehandle.h"
 #include "lltextbox.h"			// for description truncation
@@ -254,6 +255,8 @@ void LLInspectObject::onClose()
 {
 	// Release selection to deselect
 	mObjectSelection = NULL;
+
+	getChild<LLMenuButton>("gear_btn")->hideMenu();
 }
 
 //virtual