diff options
author | Oz Linden <oz@lindenlab.com> | 2012-08-14 09:01:56 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-08-14 09:01:56 -0400 |
commit | 24c1b62e27e066dc62e7681593ce7c93ee84d5a8 (patch) | |
tree | 76d5b8a1c4eb43073e85156d74e8f3eac11dfe74 /indra/newview/llvotree.h | |
parent | 2c2167229eac3efd7e7b1c5eafde8ee2e66184cd (diff) | |
parent | 337976096530729a7d671df68907cd59a7986972 (diff) |
merge back beta fixes
Diffstat (limited to 'indra/newview/llvotree.h')
-rw-r--r-- | indra/newview/llvotree.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvotree.h b/indra/newview/llvotree.h index 0554935539..52debc85ab 100644 --- a/indra/newview/llvotree.h +++ b/indra/newview/llvotree.h @@ -59,7 +59,7 @@ public: void **user_data, U32 block_num, const EObjectUpdateType update_type, LLDataPacker *dp); - /*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? /*virtual*/ void render(LLAgent &agent); |