aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltoolobjpicker.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/lltoolobjpicker.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/lltoolobjpicker.cpp')
-rw-r--r--linden/indra/newview/lltoolobjpicker.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/linden/indra/newview/lltoolobjpicker.cpp b/linden/indra/newview/lltoolobjpicker.cpp
index 52469b7..f5d25d8 100644
--- a/linden/indra/newview/lltoolobjpicker.cpp
+++ b/linden/indra/newview/lltoolobjpicker.cpp
@@ -48,7 +48,6 @@
48#include "llviewerwindow.h" 48#include "llviewerwindow.h"
49#include "lldrawable.h" 49#include "lldrawable.h"
50 50
51LLToolObjPicker* gToolObjPicker = NULL;
52 51
53LLToolObjPicker::LLToolObjPicker() 52LLToolObjPicker::LLToolObjPicker()
54: LLTool( "ObjPicker", NULL ), 53: LLTool( "ObjPicker", NULL ),
@@ -98,8 +97,8 @@ void LLToolObjPicker::pickCallback(S32 x, S32 y, MASK mask)
98 objectp = gObjectList.findObject( gLastHitObjectID ); 97 objectp = gObjectList.findObject( gLastHitObjectID );
99 if (objectp) 98 if (objectp)
100 { 99 {
101 gToolObjPicker->mHitObjectID = objectp->mID; 100 LLToolObjPicker::getInstance()->mHitObjectID = objectp->mID;
102 gToolObjPicker->mPicked = TRUE; 101 LLToolObjPicker::getInstance()->mPicked = TRUE;
103 } 102 }
104} 103}
105 104