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/llviewermenu.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h
index 003e3efe42..21b2554ceb 100644
--- a/indra/newview/llviewermenu.h
+++ b/indra/newview/llviewermenu.h
@@ -126,14 +126,14 @@ public:
 
 	virtual BOOL hideMenus();
 	
-	void setParcelSelection(LLHandle<LLParcelSelection> selection);
-	void setObjectSelection(LLHandle<LLObjectSelection> selection);
+	void setParcelSelection(LLSafeHandle<LLParcelSelection> selection);
+	void setObjectSelection(LLSafeHandle<LLObjectSelection> selection);
 
 	virtual const LLRect getMenuRect() const;
 
 protected:
-	LLHandle<LLParcelSelection> mParcelSelection;
-	LLHandle<LLObjectSelection> mObjectSelection;
+	LLSafeHandle<LLParcelSelection> mParcelSelection;
+	LLSafeHandle<LLObjectSelection> mObjectSelection;
 };
 
 extern const LLString SAVE_INTO_INVENTORY;
-- 
cgit v1.2.3