aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltoolcomp.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:34 -0500
committerJacek Antonelli2008-08-15 23:45:34 -0500
commitcd17687f01420952712a500107e0f93e7ab8d5f8 (patch)
treece48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/newview/lltoolcomp.cpp
parentSecond Life viewer sources 1.19.0.5 (diff)
downloadmeta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz
Second Life viewer sources 1.19.1.0
Diffstat (limited to 'linden/indra/newview/lltoolcomp.cpp')
-rw-r--r--linden/indra/newview/lltoolcomp.cpp8
1 files changed, 4 insertions, 4 deletions
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)
173 { 173 {
174 if (gSelectMgr->getSelection()->getObjectCount()) 174 if (gSelectMgr->getSelection()->getObjectCount())
175 { 175 {
176 gEditMenuHandler = gSelectMgr; 176 LLEditMenuHandler::gEditMenuHandler = gSelectMgr;
177 } 177 }
178 gToolInspect->setCurrentTool( gToolInspect->mSelectRect ); 178 gToolInspect->setCurrentTool( gToolInspect->mSelectRect );
179 gToolInspect->mSelectRect->handleMouseDown( x, y, mask ); 179 gToolInspect->mSelectRect->handleMouseDown( x, y, mask );
@@ -247,7 +247,7 @@ void LLToolCompTranslate::pickCallback(S32 x, S32 y, MASK mask)
247 { 247 {
248 if (gToolTranslate->mManip->getSelection()->getObjectCount()) 248 if (gToolTranslate->mManip->getSelection()->getObjectCount())
249 { 249 {
250 gEditMenuHandler = gSelectMgr; 250 LLEditMenuHandler::gEditMenuHandler = gSelectMgr;
251 } 251 }
252 252
253 BOOL can_move = gToolTranslate->mManip->canAffectSelection(); 253 BOOL can_move = gToolTranslate->mManip->canAffectSelection();
@@ -372,7 +372,7 @@ void LLToolCompScale::pickCallback(S32 x, S32 y, MASK mask)
372 { 372 {
373 if (gToolStretch->mManip->getSelection()->getObjectCount()) 373 if (gToolStretch->mManip->getSelection()->getObjectCount())
374 { 374 {
375 gEditMenuHandler = gSelectMgr; 375 LLEditMenuHandler::gEditMenuHandler = gSelectMgr;
376 } 376 }
377 if( LLManip::LL_NO_PART != gToolStretch->mManip->getHighlightedPart() ) 377 if( LLManip::LL_NO_PART != gToolStretch->mManip->getHighlightedPart() )
378 { 378 {
@@ -572,7 +572,7 @@ void LLToolCompRotate::pickCallback(S32 x, S32 y, MASK mask)
572 { 572 {
573 if (gToolRotate->mManip->getSelection()->getObjectCount()) 573 if (gToolRotate->mManip->getSelection()->getObjectCount())
574 { 574 {
575 gEditMenuHandler = gSelectMgr; 575 LLEditMenuHandler::gEditMenuHandler = gSelectMgr;
576 } 576 }
577 if( LLManip::LL_NO_PART != gToolRotate->mManip->getHighlightedPart() ) 577 if( LLManip::LL_NO_PART != gToolRotate->mManip->getHighlightedPart() )
578 { 578 {