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/llparcelselection.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/llparcelselection.cpp b/indra/newview/llparcelselection.cpp
index 5478a96b97..e49ae57bcf 100644
--- a/indra/newview/llparcelselection.cpp
+++ b/indra/newview/llparcelselection.cpp
@@ -17,9 +17,8 @@
 LLPointer<LLParcelSelection> LLParcelSelection::sNullSelection;
 
 template<> 
-	const LLHandle<LLParcelSelection>::NullFunc 
-		LLHandle<LLParcelSelection>::sNullFunc =
-			LLParcelSelection::getNullParcelSelection;
+	const LLSafeHandle<LLParcelSelection>::NullFunc 
+		LLSafeHandle<LLParcelSelection>::sNullFunc = LLParcelSelection::getNullParcelSelection;
 
 //
 // LLParcelSelection
-- 
cgit v1.2.3