From 3bab3fc66183f124d173b4ec192c03a9205788d9 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 29 Sep 2010 15:02:32 -0700
Subject: fix for crash on exit also made handle subtyping work

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

(limited to 'indra/llui/llhandle.h')

diff --git a/indra/llui/llhandle.h b/indra/llui/llhandle.h
index a43f095d67..a198a26c22 100644
--- a/indra/llui/llhandle.h
+++ b/indra/llui/llhandle.h
@@ -99,9 +99,9 @@ public:
 	{
 		return lhs.mTombStone > rhs.mTombStone;
 	}
-protected:
 
 protected:
+	template<typename T> friend class LLHandle;
 	LLPointer<LLTombStone<T> > mTombStone;
 
 private:
-- 
cgit v1.2.3


From 68b4d9164ccf2b3bb643f153be4d3b2821c4d9d9 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 29 Sep 2010 15:50:12 -0700
Subject: removed unworkable subclassing support from LLHandle<T>

---
 indra/llui/llhandle.h | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'indra/llui/llhandle.h')

diff --git a/indra/llui/llhandle.h b/indra/llui/llhandle.h
index a198a26c22..8c000eee48 100644
--- a/indra/llui/llhandle.h
+++ b/indra/llui/llhandle.h
@@ -61,13 +61,6 @@ public:
 		return *this; 
 	}
 
-	template<typename Subclass>
-	LLHandle<T>& operator =(const LLHandle<Subclass>& other)  
-	{ 
-		mTombStone = other.mTombStone;
-		return *this; 
-	}
-
 	bool isDead() const 
 	{ 
 		return mTombStone->getTarget() == NULL; 
@@ -101,7 +94,6 @@ public:
 	}
 
 protected:
-	template<typename T> friend class LLHandle;
 	LLPointer<LLTombStone<T> > mTombStone;
 
 private:
-- 
cgit v1.2.3