diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-11-14 14:44:13 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-11-14 14:44:13 -0800 |
| commit | 76caf0238cb98c1abf69d56e122c71a1208b0d72 (patch) | |
| tree | 4f4a77ff8f11e7cc0a0f7af437b8699f0d035727 /indra/newview/llwind.h | |
| parent | b403a9da23a2df73a657bfa835a3706a261af2fb (diff) | |
| parent | c24645f7b51ea27e1686bbe72470a9f3c09fc676 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llwind.h')
| -rw-r--r-- | indra/newview/llwind.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llwind.h b/indra/newview/llwind.h index 925cb6d642..3b57f07124 100644 --- a/indra/newview/llwind.h +++ b/indra/newview/llwind.h @@ -27,7 +27,6 @@ #ifndef LL_LLWIND_H #define LL_LLWIND_H -//#include "vmath.h" #include "llmath.h" #include "v3math.h" #include "v3dmath.h" @@ -44,25 +43,21 @@ public: ~LLWind(); void renderVectors(); LLVector3 getVelocity(const LLVector3 &location); // "location" is region-local - LLVector3 getCloudVelocity(const LLVector3 &location); // "location" is region-local LLVector3 getVelocityNoisy(const LLVector3 &location, const F32 dim); // "location" is region-local void decompress(LLBitPack &bitpack, LLGroupHeader *group_headerp); LLVector3 getAverage(); - void setCloudDensityPointer(F32 *densityp); void setOriginGlobal(const LLVector3d &origin_global); private: S32 mSize; F32 * mVelX; F32 * mVelY; - F32 * mCloudVelX; - F32 * mCloudVelY; - F32 * mCloudDensityp; LLVector3d mOriginGlobal; void init(); + LOG_CLASS(LLWind); }; #endif |