diff options
author | Merov Linden <merov@lindenlab.com> | 2014-03-25 12:00:00 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2014-03-25 12:00:00 -0700 |
commit | 54bba824228162724a1d46d9c7900e9aa7a077a3 (patch) | |
tree | 3355699f63f141e5fc0546dfe279b8aa65d40e07 /indra/newview/llvograss.h | |
parent | f813a25224081e68d4772676909d2cff14407486 (diff) | |
parent | 78eada5b6c3a8d20a2ea49887ab7c091e4b6fa14 (diff) |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llvograss.h')
-rwxr-xr-x | 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 e54de85412..ff4fa6b00d 100755 --- a/indra/newview/llvograss.h +++ b/indra/newview/llvograss.h @@ -74,7 +74,7 @@ public: void plantBlades(); /*virtual*/ BOOL isActive() const; // Whether this object needs to do an idleUpdate. - /*virtual*/ void idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time); + /*virtual*/ void idleUpdate(LLAgent &agent, const F64 &time); /*virtual*/ BOOL lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end, S32 face = -1, // which face to check, -1 = ALL_SIDES |