diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-06-29 13:53:35 -0700 |
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-06-29 13:53:35 -0700 |
| commit | a96a260a4dc9df6a16b3c917e2e2d2c13a4f7eea (patch) | |
| tree | 1d23ebbb1c6d8a10d43824b25d939372c7d1c354 /indra/newview/llvograss.h | |
| parent | 37f73782d21e8a66b6ede0b0356e6394d3338162 (diff) | |
| parent | 4c4a23226a2db8b1dac5b8d6b8f1537fc9164cf6 (diff) | |
Merge simon/viewmaster-merge for latest maint work
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 |