summaryrefslogtreecommitdiff
path: root/indra/llui/llhandle.h
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-02-23 11:10:13 -0700
committerXiaohong Bao <bao@lindenlab.com>2011-02-23 11:10:13 -0700
commitbfa25219b899636db74bedc258bc763caf91ddf0 (patch)
treed9d82b63d9d5d3d784b4bee852f9caed2c897a71 /indra/llui/llhandle.h
parentbcb5b209d1813681202524362dd186c8b0982357 (diff)
parent01cdeb0cdd8c48b76a229d42ced4e5563cd18c5c (diff)
Automated merge with ssh://hg.lindenlab.com/bao/private-memory-pool
Diffstat (limited to 'indra/llui/llhandle.h')
-rw-r--r--indra/llui/llhandle.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/llui/llhandle.h b/indra/llui/llhandle.h
index a43f095d67..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;
@@ -99,7 +92,6 @@ public:
{
return lhs.mTombStone > rhs.mTombStone;
}
-protected:
protected:
LLPointer<LLTombStone<T> > mTombStone;