diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-08-13 12:09:04 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-08-13 12:09:04 -0400 |
| commit | f5e35cbc5362f6b83fcccabf6b22374ca6f08d42 (patch) | |
| tree | de1746f9e607d05b535523a3179ece971edd61ba /indra/newview/llvograss.h | |
| parent | 0664cb1512481b9cd9f5ef4bc398c88416b246a9 (diff) | |
| parent | 337976096530729a7d671df68907cd59a7986972 (diff) | |
Merge from viewer-development.
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 |