diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 21:25:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 21:25:50 +0000 |
| commit | 4dabd9c0472deb49573fdafef2fa413e59703f19 (patch) | |
| tree | 06c680d6a2047e03838d6548bccd26c7baf9d652 /indra/newview/llcloud.h | |
| parent | d4462963c6ba5db2088723bbedc7b60f1184c594 (diff) | |
merge release@58699 beta-1-14-0@58707 -> release
Diffstat (limited to 'indra/newview/llcloud.h')
| -rw-r--r-- | indra/newview/llcloud.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llcloud.h b/indra/newview/llcloud.h index 06c2b5c9ff..3bb06c818b 100644 --- a/indra/newview/llcloud.h +++ b/indra/newview/llcloud.h @@ -110,7 +110,7 @@ public: BOOL inGroup(const LLCloudPuff &puff) const; F32 getDensity() const { return mDensity; } - S32 getNumPuffs() const { return mCloudPuffs.count(); } + S32 getNumPuffs() const { return (S32) mCloudPuffs.size(); } const LLCloudPuff &getPuff(const S32 i) { return mCloudPuffs[i]; } protected: LLCloudLayer *mCloudLayerp; @@ -118,7 +118,7 @@ protected: F32 mDensity; S32 mTargetPuffCount; - LLDynamicArray<LLCloudPuff> mCloudPuffs; + std::vector<LLCloudPuff> mCloudPuffs; LLPointer<LLVOClouds> mVOCloudsp; }; |