EXT-1400 New 'name popup' lets you do things (IM, TP etc) to your own avatar

EXT-1021 Update code to use new Inventory Icon art files in floater_invetory.xml
EXT-176 Open and closed state for art for folders in list view in side panel

1 files changed, 6 insertions, 8 deletions

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 3e7e5f77bb..a81d26cb7b 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -3453,14 +3453,11 @@ class LLSelfStandUp : public view_listener_t
 	}
 };
 
-class LLSelfEnableStandUp : public view_listener_t
+bool enable_standup_self()
 {
-	bool handleEvent(const LLSD& userdata)
-	{
-		bool new_value = gAgent.getAvatarObject() && gAgent.getAvatarObject()->isSitting();
-		return new_value;
-	}
-};
+	bool new_value = gAgent.getAvatarObject() && gAgent.getAvatarObject()->isSitting();
+	return new_value;
+}
 
 class LLSelfFriends : public view_listener_t
 {
@@ -7952,7 +7949,8 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLSelfStandUp(), "Self.StandUp");
 	view_listener_t::addMenu(new LLSelfRemoveAllAttachments(), "Self.RemoveAllAttachments");
 
-	view_listener_t::addMenu(new LLSelfEnableStandUp(), "Self.EnableStandUp");
+	visible.add("Self.VisibleStandUp", boost::bind(&enable_standup_self));
+	enable.add("Self.EnableStandUp", boost::bind(&enable_standup_self));
 	view_listener_t::addMenu(new LLSelfEnableRemoveAllAttachments(), "Self.EnableRemoveAllAttachments");
 
 	// we don't use boost::bind directly to delay side tray construction