diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-31 11:41:20 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-31 11:41:20 -0400 |
commit | 35aa37ceedaa1cadc5fd01639ecf0fafa2214b6f (patch) | |
tree | 70ccbf451ca7b3113d9baee8498072d7a1f55535 /indra/newview/llwind.h | |
parent | 012a0953b56d8313c6c0f71444f115de1aeeb7e1 (diff) | |
parent | f18cfe97750cc13374adab15636532fe0fbda19c (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 |