From ea8fb7238e6f12383ee4bc081475fa6235637581 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Sat, 31 Mar 2007 01:41:19 +0000
Subject: svn merge -r 59364:59813
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

---
 indra/newview/llselectmgr.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index c14b4461d6..a38bfc3600 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -133,8 +133,8 @@ struct LLDeRezInfo
 
 LLObjectSelection* get_null_object_selection()
 {
-	static LLObjectSelectionHandle null_ptr(new LLObjectSelection());
-	return (LLObjectSelection*)null_ptr;
+	static LLObjectSelection null_selection;
+	return &null_selection;;
 }
 
 
-- 
cgit v1.2.3