Pull merge from lindenlab/viewer-developement

1 files changed, 5 insertions, 3 deletions

diff --git a/indra/newview/llpaneltopinfobar.cpp b/indra/newview/llpaneltopinfobar.cpp
index 854deb00d0..343c140bbb 100644
--- a/indra/newview/llpaneltopinfobar.cpp
+++ b/indra/newview/llpaneltopinfobar.cpp
@@ -64,9 +64,6 @@ private:
 
 LLPanelTopInfoBar::LLPanelTopInfoBar(): mParcelChangedObserver(0)
 {
-	LLUICtrl::CommitCallbackRegistry::currentRegistrar()
-			.add("TopInfoBar.Action", boost::bind(&LLPanelTopInfoBar::onContextMenuItemClicked, this, _2));
-
 	buildFromFile( "panel_topinfo_bar.xml");
 }
 
@@ -132,6 +129,11 @@ void LLPanelTopInfoBar::handleLoginComplete()
 
 BOOL LLPanelTopInfoBar::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
+	if(!LLUICtrl::CommitCallbackRegistry::getValue("TopInfoBar.Action"))
+	{
+		LLUICtrl::CommitCallbackRegistry::currentRegistrar()
+				.add("TopInfoBar.Action", boost::bind(&LLPanelTopInfoBar::onContextMenuItemClicked, this, _2));
+	}
 	show_topinfobar_context_menu(this, x, y);
 	return TRUE;
 }