Merge branch 'develop' into nat/edu-channel

1 files changed, 3 insertions, 2 deletions

diff --git a/indra/llmath/lltreenode.h b/indra/llmath/lltreenode.h
index a0b90e3511..e3d30206b7 100644
--- a/indra/llmath/lltreenode.h
+++ b/indra/llmath/lltreenode.h
@@ -56,10 +56,11 @@ public:
     virtual bool insert(T* data);
     virtual bool remove(T* data);
     virtual void notifyRemoval(T* data);
-    virtual U32 getListenerCount()                  { return mListeners.size(); }
+    virtual U32 hasListeners() const { return !mListeners.empty(); }
+    virtual U32 getListenerCount() const { return static_cast<U32>(mListeners.size()); }
     virtual LLTreeListener<T>* getListener(U32 index) const
     {
-        if(index < mListeners.size())
+        if (index < mListeners.size())
         {
             return mListeners[index];
         }