From dab87201cd37e27d72a0e233ccfbdf3697457190 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 9 Dec 2009 16:37:08 -0800
Subject: Partial EXT-3268 Object Profile option showing up in avatar 3D
 Context menu Renamed gPie* and menu_pie_* to just gMenu* and menu_* because
 they are no longer pie menus.  Created separate other-attachment menus.
 Reviewed with Richard.

---
 indra/newview/llselectmgr.cpp | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

(limited to 'indra/newview/llselectmgr.cpp')

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 4d6c19157a..6e99d5a5f0 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -3494,7 +3494,7 @@ void LLSelectMgr::deselectAllIfTooFar()
 
 	// HACK: Don't deselect when we're navigating to rate an object's
 	// owner or creator.  JC
-	if (gPieObject->getVisible() || gPieRate->getVisible() )
+	if (gMenuObject->getVisible())
 	{
 		return;
 	}
@@ -5493,11 +5493,15 @@ void dialog_refresh_all()
 
 	gFloaterTools->dirty();
 
-	gPieObject->needsArrange();
+	gMenuObject->needsArrange();
 
-	if( gPieAttachment->getVisible() )
+	if( gMenuAttachmentSelf->getVisible() )
 	{
-		gPieAttachment->arrange();
+		gMenuAttachmentSelf->arrange();
+	}
+	if( gMenuAttachmentOther->getVisible() )
+	{
+		gMenuAttachmentOther->arrange();
 	}
 
 	LLFloaterProperties::dirtyAll();
@@ -5754,21 +5758,21 @@ void LLSelectMgr::redo()
 //-----------------------------------------------------------------------------
 BOOL LLSelectMgr::canDoDelete() const
 {
-	bool can_delete = false;
-	// This function is "logically const" - it does not change state in
-	// a way visible outside the selection manager.
-	LLSelectMgr* self = const_cast<LLSelectMgr*>(this);
-	LLViewerObject* obj = self->mSelectedObjects->getFirstDeleteableObject();
-	// Note: Can only delete root objects (see getFirstDeleteableObject() for more info)
-	if (obj!= NULL)
-	{
-		// all the faces needs to be selected
-		if(self->mSelectedObjects->contains(obj,SELECT_ALL_TES ))
-		{
-			can_delete = true;
-		}
-	}
-	
+	bool can_delete = false;
+	// This function is "logically const" - it does not change state in
+	// a way visible outside the selection manager.
+	LLSelectMgr* self = const_cast<LLSelectMgr*>(this);
+	LLViewerObject* obj = self->mSelectedObjects->getFirstDeleteableObject();
+	// Note: Can only delete root objects (see getFirstDeleteableObject() for more info)
+	if (obj!= NULL)
+	{
+		// all the faces needs to be selected
+		if(self->mSelectedObjects->contains(obj,SELECT_ALL_TES ))
+		{
+			can_delete = true;
+		}
+	}
+	
 	return can_delete;
 }
 
-- 
cgit v1.2.3