diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
| commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
| tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/newview/lltoolobjpicker.cpp | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/lltoolobjpicker.cpp')
| -rw-r--r-- | indra/newview/lltoolobjpicker.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/lltoolobjpicker.cpp b/indra/newview/lltoolobjpicker.cpp index a8876da131..8354792e31 100644 --- a/indra/newview/lltoolobjpicker.cpp +++ b/indra/newview/lltoolobjpicker.cpp @@ -48,7 +48,6 @@ #include "llviewerwindow.h" #include "lldrawable.h" -LLToolObjPicker* gToolObjPicker = NULL; LLToolObjPicker::LLToolObjPicker() : LLTool( "ObjPicker", NULL ), @@ -98,8 +97,8 @@ void LLToolObjPicker::pickCallback(S32 x, S32 y, MASK mask) objectp = gObjectList.findObject( gLastHitObjectID ); if (objectp) { - gToolObjPicker->mHitObjectID = objectp->mID; - gToolObjPicker->mPicked = TRUE; + LLToolObjPicker::getInstance()->mHitObjectID = objectp->mID; + LLToolObjPicker::getInstance()->mPicked = TRUE; } } |