diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-20 19:46:38 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-20 19:46:38 -0700 |
| commit | 44b428f4c372e6dd86e276af6c01b9351b4a3bd9 (patch) | |
| tree | 0f66d29eaac2eedcf2e647ffc2a71f6f47fc015f | |
| parent | 1aa431bca280fcd7c9b1ad2f1bc8e0e7dd7df5eb (diff) | |
| parent | 243210e0ab0bc1454bcbb3a5325fec199737a7c3 (diff) | |
STORM-419 : merge with viewer-development
| -rw-r--r-- | doc/contributions.txt | 2 | ||||
| -rw-r--r-- | indra/llcommon/lldarray.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 195af5c0c2..6daeb03d0b 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -530,6 +530,7 @@ Pf Shan CT-230 CT-231 CT-321 + SNOW-422 princess niven VWR-5733 CT-85 @@ -644,6 +645,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 a8cd03b42a..131b819c99 100644 --- a/indra/llcommon/lldarray.h +++ b/indra/llcommon/lldarray.h @@ -51,7 +51,7 @@ public: 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); } |