From 941cb9f4124c9ccfd5c845bc94639fa46df12c3d Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Tue, 1 Apr 2008 17:45:04 +0000
Subject: merge release@83343 skinning-1-merge@83714 -> release QAR-424

---
 indra/newview/lltoolobjpicker.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'indra/newview/lltoolobjpicker.cpp')

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;
 	}
 }
 
-- 
cgit v1.2.3