summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-07-20 11:31:23 -0700
committerRichard Nelson <none@none>2010-07-20 11:31:23 -0700
commitfde4edf75db5a6f6338140cddfba289802b94c2e (patch)
treec9e7f05654525d3a5ed2d89267462f92b5e8fd6f /indra/llcommon
parent4bd450737bf1f5a74a4857932235d7bcbead1388 (diff)
parent5ed10612172cc1f9d50784e6087631ddf700ccad (diff)
merge
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/lldarray.h2
-rw-r--r--indra/llcommon/llstrider.h2
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; }