summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatarself.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-03-10 15:47:27 -0400
committerOz Linden <oz@lindenlab.com>2014-03-10 15:47:27 -0400
commit0f3ba54a7ececa4d6f7c247a3ffa3a2f9572268e (patch)
treec7d3d7cc7a6d1a22ad7b69f45ade31ef4780f9e6 /indra/newview/llvoavatarself.h
parent2b4d3fff706d098076bb6c0a7dce2ca35b83300f (diff)
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
merge changes for 3.7.3-release
Diffstat (limited to 'indra/newview/llvoavatarself.h')
-rwxr-xr-xindra/newview/llvoavatarself.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h
index 3b7b6bac64..521c86e1c3 100755
--- a/indra/newview/llvoavatarself.h
+++ b/indra/newview/llvoavatarself.h
@@ -84,7 +84,7 @@ protected:
//--------------------------------------------------------------------
public:
/*virtual*/ void updateRegion(LLViewerRegion *regionp);
- /*virtual*/ void idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time);
+ /*virtual*/ void idleUpdate(LLAgent &agent, const F64 &time);
//--------------------------------------------------------------------
// LLCharacter interface and related