From 14360b815ed486c90c57b8025f8c93376ca6b6c6 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Tue, 6 Mar 2007 00:37:09 +0000
Subject: merge -r 58641:58711 maintenance -> release

---
 indra/llcommon/llmemory.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llcommon')

diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
index d543d023ff..f7f4818740 100644
--- a/indra/llcommon/llmemory.h
+++ b/indra/llcommon/llmemory.h
@@ -239,7 +239,7 @@ public:
 
 	// support conversion up the type hierarchy.  See Item 45 in Effective C++, 3rd Ed.
 	template<typename Subclass>
-	LLHandle(const LLPointer<Subclass>& ptr) : 
+	LLHandle(const LLHandle<Subclass>& ptr) : 
 		mPointer(ptr.get())
 	{
 		ref();
-- 
cgit v1.2.3