diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:56:14 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:56:14 +0000 |
| commit | a3f3ab7e113e44309461b26399d627814f0ce4f9 (patch) | |
| tree | 695b2a41f8d31330634ef59e7d6ece526242fd86 /indra/llcommon | |
| parent | d85247e63e5ff0b488211b62429a4895b48dee27 (diff) | |
QAR-449 Viewer 1.20 RC 1
merge Branch_1-20-Viewer -r 84432 : 84760 -> release
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/lldarray.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/lldarray.h b/indra/llcommon/lldarray.h index 3b46706d42..c7268b8dab 100644 --- a/indra/llcommon/lldarray.h +++ b/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; } |