diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-07 08:40:59 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-07 08:40:59 +0100 |
| commit | c3cdb8ced6ad9cedf9a4b37d19d302c59d33d72c (patch) | |
| tree | f0c5484493ffc1319439f31b1df77bf9d818bdbb /indra/llcommon | |
| parent | b89c31052802450ec59fee48ace4c66a713755ab (diff) | |
| parent | aad87303c88458c9db3c312d44e8a4b125de1fe3 (diff) | |
merge from viewer-trunk
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/lldarray.h | 2 | ||||
| -rw-r--r-- | indra/llcommon/llstrider.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/lldarray.h b/indra/llcommon/lldarray.h index 0e56a11d53..af647c7e7a 100644 --- a/indra/llcommon/lldarray.h +++ b/indra/llcommon/lldarray.h @@ -202,7 +202,7 @@ public: { U32 n = mVector.size(); mIndexMap[k] = n; - mVector.resize(n+1); + mVector.push_back(Type()); llassert(mVector.size() == mIndexMap.size()); return mVector[n]; } diff --git a/indra/llcommon/llstrider.h b/indra/llcommon/llstrider.h index 369b06b48a..44ea80a36b 100644 --- a/indra/llcommon/llstrider.h +++ b/indra/llcommon/llstrider.h @@ -51,7 +51,7 @@ public: void setStride (S32 skipBytes) { mSkip = (skipBytes ? skipBytes : sizeof(Object));} void skip(const U32 index) { mBytep += mSkip*index;} - + U32 getSkip() const { return mSkip; } Object* get() { return mObjectp; } Object* operator->() { return mObjectp; } Object& operator *() { return *mObjectp; } |