Second Life viewer sources 1.20.2

1 files changed, 2 insertions, 1 deletions

diff --git a/linden/indra/llcommon/lldarray.h b/linden/indra/llcommon/lldarray.h
index 9bffd63..45e564f 100644
--- a/linden/indra/llcommon/lldarray.h
+++ b/linden/indra/llcommon/lldarray.h
@@ -119,11 +119,12 @@ inline S32 LLDynamicArray<Type,BlockSize>::removeObj(const Type& obj)
         typename std::vector<Type>::iterator iter = std::find(this->begin(), this->end(), obj);
         if (iter != this->end())
         {
+                S32 res = iter - this->begin();
                 typename std::vector<Type>::iterator last = this->end(); 
                 --last;
                 *iter = *last;
                 this->pop_back();
-                return iter - this->begin();
+                return res;
         }
         return FAIL;
 }