From ce7682c2a468e926d6b38e4f95bd289a8d26222c Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Wed, 18 Jul 2007 21:22:40 +0000
Subject: svn merge -r64837:65485
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

(only inside indra)

(josh) Original log message was:
   svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
   svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
   svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
---
 indra/llmath/lltreenode.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'indra/llmath/lltreenode.h')

diff --git a/indra/llmath/lltreenode.h b/indra/llmath/lltreenode.h
index 67c6cb631a..3445730adf 100644
--- a/indra/llmath/lltreenode.h
+++ b/indra/llmath/lltreenode.h
@@ -49,17 +49,17 @@ class LLTreeNode
 public:
 	LLTreeNode(LLTreeState<T>* state)				{ setState(state); }
 	virtual ~LLTreeNode();
-	virtual LLTreeState<T>* getState()				{ return mState; }
-	virtual const LLTreeState<T>* getState() const	{ return mState; }
-
-	virtual void setState(LLTreeState<T>* state);
-	virtual void insert(T* data);
-	virtual bool remove(T* data);
-	virtual void notifyRemoval(T* data);
-	virtual U32 getListenerCount()					{ return mListeners.size(); }
-	virtual LLTreeListener<T>* getListener(U32 index) const { return mListeners[index]; }
-	virtual void addListener(LLTreeListener<T>* listener) { mListeners.push_back(listener); }
-	virtual void removeListener(U32 index) { mListeners.erase(mListeners.begin()+index); }
+	LLTreeState<T>* getState()				{ return mState; }
+	const LLTreeState<T>* getState() const	{ return mState; }
+
+	void setState(LLTreeState<T>* state);
+	void insert(T* data);
+	bool remove(T* data);
+	void notifyRemoval(T* data);
+	inline U32 getListenerCount()					{ return mListeners.size(); }
+	inline LLTreeListener<T>* getListener(U32 index) const { return mListeners[index]; }
+	inline void addListener(LLTreeListener<T>* listener) { mListeners.push_back(listener); }
+	inline void removeListener(U32 index) { mListeners.erase(mListeners.begin()+index); }
 
 protected:
 	void destroyListeners()
-- 
cgit v1.3