diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-09-07 14:47:24 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-09-07 14:47:24 -0400 |
| commit | 695c4135ff6fa0c50daa4c84f23096096ffd8a54 (patch) | |
| tree | a9b539e3ba588634fc493f2ed5ead21124e306ff /indra/newview/llvograss.h | |
| parent | af6e665d5c9c9a5ea480389c284839f3945bf786 (diff) | |
| parent | b6f0921099b9b2a0a582886ebd6383fa20eac2b0 (diff) | |
Automated merge with file:///Users/nat/linden/davep-viewer-development-rebased
Diffstat (limited to 'indra/newview/llvograss.h')
| -rw-r--r-- | indra/newview/llvograss.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvograss.h b/indra/newview/llvograss.h index 00a59facf7..b9835b8802 100644 --- a/indra/newview/llvograss.h +++ b/indra/newview/llvograss.h @@ -73,7 +73,7 @@ public: void plantBlades(); /*virtual*/ BOOL isActive() const; // Whether this object needs to do an idleUpdate. - BOOL idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time); + /*virtual*/ void idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time); /*virtual*/ BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end, S32 face = -1, // which face to check, -1 = ALL_SIDES |