summaryrefslogtreecommitdiff
path: root/indra/newview/llvowater.h
diff options
context:
space:
mode:
authorBaker Linden <baker@lindenlab.com>2014-03-11 16:32:23 -0700
committerBaker Linden <baker@lindenlab.com>2014-03-11 16:32:23 -0700
commit6137e120d1836ea37ea8f5f6723d86db94f31bd8 (patch)
tree16341e6203400d52e89189d96206c26e899dbe44 /indra/newview/llvowater.h
parentb0c1dd4790847364ebcab1cb1d4103500f64072e (diff)
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
3.7.4. merge
Diffstat (limited to 'indra/newview/llvowater.h')
-rwxr-xr-xindra/newview/llvowater.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvowater.h b/indra/newview/llvowater.h
index cf9323ef2e..7a8d819215 100755
--- a/indra/newview/llvowater.h
+++ b/indra/newview/llvowater.h
@@ -58,7 +58,7 @@ public:
static void initClass();
static void cleanupClass();
- /*virtual*/ void idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time);
+ /*virtual*/ void idleUpdate(LLAgent &agent, const F64 &time);
/*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
/*virtual*/ BOOL updateGeometry(LLDrawable *drawable);
/*virtual*/ void updateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax);