diff --git a/doc/contributions.txt b/doc/contributions.txt index bcf714b29a796e98fd0a62f53775d82d1d2b1578..256640126f38991845daf0cbb80114d08f11f316 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -529,6 +529,7 @@ Pf Shan CT-230 CT-231 CT-321 + SNOW-422 princess niven VWR-5733 CT-85 @@ -643,6 +644,7 @@ Strife Onizuka VWR-183 VWR-2265 VWR-4111 + SNOW-691 Tayra Dagostino SNOW-517 SNOW-543 diff --git a/indra/llcommon/lldarray.h b/indra/llcommon/lldarray.h index a8cd03b42a92f7b0d53bded21676c8149a8d73d4..131b819c99148f29c136c77012450ffe6a02de10 100644 --- a/indra/llcommon/lldarray.h +++ b/indra/llcommon/lldarray.h @@ -51,7 +51,7 @@ class LLDynamicArray : public std::vector<Type> LLDynamicArray(S32 size=0) : std::vector<Type>(size) { if (size < BlockSize) std::vector<Type>::reserve(BlockSize); } - void reset() { std::vector<Type>::resize(0); } + void reset() { std::vector<Type>::clear(); } // ACCESSORS const Type& get(S32 index) const { return std::vector<Type>::operator[](index); }