From 27d6f0e49cfcf549efbfec350bfb500e397cccb2 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 7 Dec 2010 13:39:56 -0800
Subject: EXT-3265 Gear menu on_visible params are broken - not setting
 visibility of menu items EXT-2923 [BSI] My own inspector lists "Stand Up" as
 an option in gear menu, while I'm standing

---
 indra/llui/lluictrl.h | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'indra/llui/lluictrl.h')

diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index b20ff5d798..983700065d 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -63,9 +63,6 @@ public:
 	typedef boost::function<bool (LLUICtrl* ctrl, const LLSD& param)> enable_callback_t;
 	typedef boost::signals2::signal<bool (LLUICtrl* ctrl, const LLSD& param), boost_boolean_combiner> enable_signal_t;
 	
-	typedef boost::function<bool (LLUICtrl* ctrl, const LLSD& param)> visible_callback_t;
-	typedef boost::signals2::signal<bool (LLUICtrl* ctrl, const LLSD& param), boost_boolean_combiner> visible_signal_t;
-	
 	struct CallbackParam : public LLInitParam::Block<CallbackParam>
 	{
 		Ignored					name;
@@ -87,12 +84,7 @@ public:
 	{
 		Optional<enable_callback_t> function;
 	};
-	
-	struct VisibleCallbackParam : public LLInitParam::Block<VisibleCallbackParam, CallbackParam >
-	{
-		Optional<visible_callback_t> function;
-	};
-	
+		
 	struct EnableControls : public LLInitParam::Choice<EnableControls>
 	{
 		Alternative<std::string> enabled;
@@ -148,7 +140,6 @@ protected:
 	
 	commit_signal_t::slot_type initCommitCallback(const CommitCallbackParam& cb);
 	enable_signal_t::slot_type initEnableCallback(const EnableCallbackParam& cb);
-	visible_signal_t::slot_type initVisibleCallback(const VisibleCallbackParam& cb);
 
 	// We need this virtual so we can override it with derived versions
 	virtual LLViewModel* getViewModel() const;
@@ -270,9 +261,7 @@ public:
 
 	class CommitCallbackRegistry : public CallbackRegistry<commit_callback_t, CommitCallbackRegistry>{};
 	class EnableCallbackRegistry : public CallbackRegistry<enable_callback_t, EnableCallbackRegistry>{};
-	class VisibleCallbackRegistry : public CallbackRegistry<visible_callback_t, VisibleCallbackRegistry>{};
-
-	
+		
 protected:
 
 	static bool controlListener(const LLSD& newvalue, LLHandle<LLUICtrl> handle, std::string type);
-- 
cgit v1.2.3