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/llfloaterinspect.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/llfloaterinspect.h b/indra/newview/llfloaterinspect.h
index 8656f13124..befb133f68 100644
--- a/indra/newview/llfloaterinspect.h
+++ b/indra/newview/llfloaterinspect.h
@@ -67,7 +67,7 @@ private:
 	// static data
 	static LLFloaterInspect* sInstance;
 
-	LLHandle<LLObjectSelection> mObjectSelection;
+	LLSafeHandle<LLObjectSelection> mObjectSelection;
 };
 
 #endif //LL_LLFLOATERINSPECT_H
-- 
cgit v1.2.3