diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-24 11:57:35 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-24 11:57:35 -0400 |
commit | 00ad0c425398dd748f4759243dc789199a73e87d (patch) | |
tree | 801ab4805be44117bda3a6d35e18161cc3ccd1c5 /indra/newview/llvowater.h | |
parent | e677e5e77114cfbfcd7c5e838922fdf8d12853fb (diff) | |
parent | e5752934be74a84e6ec0ff8cb96974bd1e9060ec (diff) |
merge up to latest viewer-development with mesh changes
Diffstat (limited to 'indra/newview/llvowater.h')
-rw-r--r-- | indra/newview/llvowater.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvowater.h b/indra/newview/llvowater.h index cb9584cabf..ed709dd840 100644 --- a/indra/newview/llvowater.h +++ b/indra/newview/llvowater.h @@ -61,7 +61,7 @@ public: /*virtual*/ BOOL idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time); /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline); /*virtual*/ BOOL updateGeometry(LLDrawable *drawable); - /*virtual*/ void updateSpatialExtents(LLVector3& newMin, LLVector3& newMax); + /*virtual*/ void updateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax); /*virtual*/ void updateTextures(); /*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area |