1 files changed, 4 insertions, 6 deletions

diff --git a/linden/indra/llcommon/llevent.cpp b/linden/indra/llcommon/llevent.cpp
index e9b6a51..bbb37c5 100644
--- a/linden/indra/llcommon/llevent.cpp
+++ b/linden/indra/llcommon/llevent.cpp
@@ -186,16 +186,14 @@ void LLSimpleDispatcher::addListener(LLEventListener* listener, LLSD filter, con
 
 void LLSimpleDispatcher::removeListener(LLEventListener* listener)
 {
-        std::vector<LLListenerEntry>::iterator itor;
-        for (itor=mListeners.begin(); itor!=mListeners.end();)
+        std::vector<LLListenerEntry>::iterator itor = mListeners.begin();
+        std::vector<LLListenerEntry>::iterator end = mListeners.end();
+        for (; itor != end; ++itor)
         {
                 if ((*itor).listener == listener)
                 {
                         mListeners.erase(itor);
-                }
-                else
-                {
-                        ++itor;
+                        break;
                 }
         }
         listener->handleDetach(mParent);