From cd17687f01420952712a500107e0f93e7ab8d5f8 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:34 -0500
Subject: Second Life viewer sources 1.19.1.0

---
 linden/indra/newview/lltoolcomp.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'linden/indra/newview/lltoolcomp.cpp')

diff --git a/linden/indra/newview/lltoolcomp.cpp b/linden/indra/newview/lltoolcomp.cpp
index 2882b6f..055cbb7 100644
--- a/linden/indra/newview/lltoolcomp.cpp
+++ b/linden/indra/newview/lltoolcomp.cpp
@@ -173,7 +173,7 @@ void LLToolCompInspect::pickCallback(S32 x, S32 y, MASK mask)
 	{
 		if (gSelectMgr->getSelection()->getObjectCount())
 		{
-			gEditMenuHandler = gSelectMgr;
+			LLEditMenuHandler::gEditMenuHandler = gSelectMgr;
 		}
 		gToolInspect->setCurrentTool( gToolInspect->mSelectRect );
 		gToolInspect->mSelectRect->handleMouseDown( x, y, mask );
@@ -247,7 +247,7 @@ void LLToolCompTranslate::pickCallback(S32 x, S32 y, MASK mask)
 	{
 		if (gToolTranslate->mManip->getSelection()->getObjectCount())
 		{
-			gEditMenuHandler = gSelectMgr;
+			LLEditMenuHandler::gEditMenuHandler = gSelectMgr;
 		}
 
 		BOOL can_move = gToolTranslate->mManip->canAffectSelection();
@@ -372,7 +372,7 @@ void LLToolCompScale::pickCallback(S32 x, S32 y, MASK mask)
 	{
 		if (gToolStretch->mManip->getSelection()->getObjectCount())
 		{
-			gEditMenuHandler = gSelectMgr;
+			LLEditMenuHandler::gEditMenuHandler = gSelectMgr;
 		}
 		if(	LLManip::LL_NO_PART != gToolStretch->mManip->getHighlightedPart() )
 		{
@@ -572,7 +572,7 @@ void LLToolCompRotate::pickCallback(S32 x, S32 y, MASK mask)
 	{
 		if (gToolRotate->mManip->getSelection()->getObjectCount())
 		{
-			gEditMenuHandler = gSelectMgr;
+			LLEditMenuHandler::gEditMenuHandler = gSelectMgr;
 		}
 		if(	LLManip::LL_NO_PART != gToolRotate->mManip->getHighlightedPart() )
 		{
-- 
cgit v1.1