diff options
author | Oz Linden <oz@lindenlab.com> | 2012-08-16 08:52:26 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-08-16 08:52:26 -0400 |
commit | a7d8b425097a7fab0a5a40d6a6b5770deb0bb7f9 (patch) | |
tree | 81e800d495674faa37d66c18db36cbfccd7fc5eb /indra/newview/llvoground.h | |
parent | df93749819c503a66bc0ad34aeb1c7bed3746df2 (diff) | |
parent | b9e43dfd646990be236e44814ce3199de3391dc1 (diff) |
merge up to latest viewer-development
Diffstat (limited to 'indra/newview/llvoground.h')
-rw-r--r-- | indra/newview/llvoground.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoground.h b/indra/newview/llvoground.h index 73b097327e..290579b4da 100644 --- a/indra/newview/llvoground.h +++ b/indra/newview/llvoground.h @@ -41,7 +41,7 @@ protected: public: LLVOGround(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp); - /*virtual*/ BOOL idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time); + /*virtual*/ void idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time); // Graphical stuff for objects - maybe broken out into render class // later? |