aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltoolpipette.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:42 -0500
committerJacek Antonelli2008-08-15 23:45:42 -0500
commitce28e056c20bf2723f565bbf464b87781ec248a2 (patch)
treeef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/newview/lltoolpipette.cpp
parentSecond Life viewer sources 1.19.1.4b (diff)
downloadmeta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz
Second Life viewer sources 1.20.2
Diffstat (limited to 'linden/indra/newview/lltoolpipette.cpp')
-rw-r--r--linden/indra/newview/lltoolpipette.cpp17
1 files changed, 7 insertions, 10 deletions
diff --git a/linden/indra/newview/lltoolpipette.cpp b/linden/indra/newview/lltoolpipette.cpp
index 67499cc..eaae390 100644
--- a/linden/indra/newview/lltoolpipette.cpp
+++ b/linden/indra/newview/lltoolpipette.cpp
@@ -46,9 +46,6 @@
46#include "llselectmgr.h" 46#include "llselectmgr.h"
47#include "lltoolmgr.h" 47#include "lltoolmgr.h"
48 48
49// Globals
50LLToolPipette *gToolPipette = NULL;
51
52// 49//
53// Member functions 50// Member functions
54// 51//
@@ -79,9 +76,9 @@ BOOL LLToolPipette::handleMouseDown(S32 x, S32 y, MASK mask)
79BOOL LLToolPipette::handleMouseUp(S32 x, S32 y, MASK mask) 76BOOL LLToolPipette::handleMouseUp(S32 x, S32 y, MASK mask)
80{ 77{
81 mSuccess = TRUE; 78 mSuccess = TRUE;
82 gSelectMgr->unhighlightAll(); 79 LLSelectMgr::getInstance()->unhighlightAll();
83 // *NOTE: This assumes the pipette tool is a transient tool. 80 // *NOTE: This assumes the pipette tool is a transient tool.
84 gToolMgr->clearTransientTool(); 81 LLToolMgr::getInstance()->clearTransientTool();
85 setMouseCapture(FALSE); 82 setMouseCapture(FALSE);
86 return TRUE; 83 return TRUE;
87} 84}
@@ -113,7 +110,7 @@ BOOL LLToolPipette::handleToolTip(S32 x, S32 y, LLString& msg, LLRect *sticky_re
113void LLToolPipette::pickCallback(S32 x, S32 y, MASK mask) 110void LLToolPipette::pickCallback(S32 x, S32 y, MASK mask)
114{ 111{
115 LLViewerObject* hit_obj = gViewerWindow->lastObjectHit(); 112 LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
116 gSelectMgr->unhighlightAll(); 113 LLSelectMgr::getInstance()->unhighlightAll();
117 114
118 // if we clicked on a face of a valid prim, save off texture entry data 115 // if we clicked on a face of a valid prim, save off texture entry data
119 if (hit_obj && 116 if (hit_obj &&
@@ -121,11 +118,11 @@ void LLToolPipette::pickCallback(S32 x, S32 y, MASK mask)
121 gLastHitObjectFace != -1) 118 gLastHitObjectFace != -1)
122 { 119 {
123 //TODO: this should highlight the selected face only 120 //TODO: this should highlight the selected face only
124 gSelectMgr->highlightObjectOnly(hit_obj); 121 LLSelectMgr::getInstance()->highlightObjectOnly(hit_obj);
125 gToolPipette->mTextureEntry = *hit_obj->getTE(gLastHitObjectFace); 122 LLToolPipette::getInstance()->mTextureEntry = *hit_obj->getTE(gLastHitObjectFace);
126 if (gToolPipette->mSelectCallback) 123 if (LLToolPipette::getInstance()->mSelectCallback)
127 { 124 {
128 gToolPipette->mSelectCallback(gToolPipette->mTextureEntry, gToolPipette->mUserData); 125 LLToolPipette::getInstance()->mSelectCallback(LLToolPipette::getInstance()->mTextureEntry, LLToolPipette::getInstance()->mUserData);
129 } 126 }
130 } 127 }
131} 128}