1 files changed, 15 insertions, 7 deletions

diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 5ed8dc5fb9..8a69c362b2 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -1445,28 +1445,29 @@ BOOL LLToolPie::pickRightMouseDownCallback()
 	{
 		LLParcelSelectionHandle selection = LLViewerParcelMgr::getInstance()->selectParcelAt( mPick.mPosGlobal );
 		gMenuHolder->setParcelSelection(selection);
-		gPieLand->show(x, y);
+		gMenuLand->show(x, y);
 
 		showVisualContextMenuEffect();
 
 	}
 	else if (mPick.mObjectID == gAgent.getID() )
 	{
-		if(!gPieSelf) 
+		if(!gMenuAvatarSelf) 
 		{
 			//either at very early startup stage or at late quitting stage,
 			//this event is ignored.
 			return TRUE ;
 		}
 
-		gPieSelf->show(x, y);
+		gMenuAvatarSelf->show(x, y);
 	}
 	else if (object)
 	{
 		gMenuHolder->setObjectSelection(LLSelectMgr::getInstance()->getSelection());
 
+		bool is_other_attachment = (object->isAttachment() && !object->isHUDAttachment() && !object->permYouOwner());
 		if (object->isAvatar() 
-			|| (object->isAttachment() && !object->isHUDAttachment() && !object->permYouOwner()))
+			|| is_other_attachment)
 		{
 			// Find the attachment's avatar
 			while( object && object->isAttachment())
@@ -1486,11 +1487,18 @@ BOOL LLToolPie::pickRightMouseDownCallback()
 				gMenuHolder->childSetText("Avatar Mute", std::string("Mute")); // *TODO:Translate
 			}
 
-			gPieAvatar->show(x, y);
+			if (is_other_attachment)
+			{
+				gMenuAttachmentOther->show(x, y);
+			}
+			else
+			{
+				gMenuAvatarOther->show(x, y);
+			}
 		}
 		else if (object->isAttachment())
 		{
-			gPieAttachment->show(x, y);
+			gMenuAttachmentSelf->show(x, y);
 		}
 		else
 		{
@@ -1510,7 +1518,7 @@ BOOL LLToolPie::pickRightMouseDownCallback()
 				gMenuHolder->childSetText("Object Mute", std::string("Mute")); // *TODO:Translate
 			}
 			
-			gPieObject->show(x, y);
+			gMenuObject->show(x, y);
 
 			showVisualContextMenuEffect();
 		}