summaryrefslogtreecommitdiff
path: root/indra/newview/llvowater.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2014-03-12 17:24:07 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2014-03-12 17:24:07 -0400
commitd9e3a2948af710741c99014bef03e8d97f69804c (patch)
tree98ed67f97cb6522f80c3720b4d1ae623e4c5920f /indra/newview/llvowater.cpp
parent895d52a399739962c38ddf571e57f85362823dff (diff)
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
merge
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)
{
}