summaryrefslogtreecommitdiff
path: root/indra/newview/llvowater.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-03-14 16:38:12 -0400
committerOz Linden <oz@lindenlab.com>2014-03-14 16:38:12 -0400
commitd6fdc6e68fc713b21b68e42740d63c3e9005bceb (patch)
tree8692c2c7ac5e3b0bbb5fa2b5362f2796dcf71e8b /indra/newview/llvowater.cpp
parentbc7a579ba285fa64876a2bc116685f0357fe25dc (diff)
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
merge changes for 3.7.3-release
Diffstat (limited to 'indra/newview/llvowater.cpp')
-rwxr-xr-xindra/newview/llvowater.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvowater.cpp b/indra/newview/llvowater.cpp
index e8a1c3d1d6..21595ee0bc 100755
--- a/indra/newview/llvowater.cpp
+++ b/indra/newview/llvowater.cpp
@@ -100,7 +100,7 @@ void LLVOWater::updateTextures()
}
// Never gets called
-void LLVOWater::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
+void LLVOWater::idleUpdate(LLAgent &agent, const F64 &time)
{
}