From 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Tue, 19 Feb 2008 21:42:32 +0000
Subject: merge
 svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986
 : 80178 -> release.

QAR-290 = QAR-271 + QAR-191
---
 indra/newview/lltoolpie.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/lltoolpie.h')

diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h
index ffc2fb9122..1af4b26a94 100644
--- a/indra/newview/lltoolpie.h
+++ b/indra/newview/lltoolpie.h
@@ -78,7 +78,7 @@ protected:
 	BOOL				mMouseOutsideSlop;				// for this drag, has mouse moved outside slop region
 	static LLPointer<LLViewerObject> sClickActionObject;
 	static U8				sClickAction;
-	static LLHandle<LLObjectSelection> sLeftClickSelection;
+	static LLSafeHandle<LLObjectSelection> sLeftClickSelection;
 };
 
 extern LLToolPie *gToolPie;
-- 
cgit v1.2.3