summaryrefslogtreecommitdiff
path: root/indra/newview/llvowater.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-03-10 16:20:09 -0700
committerMerov Linden <merov@lindenlab.com>2014-03-10 16:20:09 -0700
commit5690becdf4743286b196a331c48c8aa0332a8c66 (patch)
tree7c64dba5dca5ccfc9631f92fa7d662257654137b /indra/newview/llvowater.cpp
parent807fa3ee06cc139fcc41f69ed2caac20a8e8370d (diff)
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
Pull merge from lindenlab/viewer-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)
{
}