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/llvovolume.h | |
| parent | 2c2167229eac3efd7e7b1c5eafde8ee2e66184cd (diff) | |
| parent | 337976096530729a7d671df68907cd59a7986972 (diff) | |
merge back beta fixes
Diffstat (limited to 'indra/newview/llvovolume.h')
| -rw-r--r-- | indra/newview/llvovolume.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index 8cb69930be..0082f2e991 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -68,7 +68,7 @@ class LLVolumeInterface public: virtual ~LLVolumeInterface() { } virtual LLVolumeInterfaceType getInterfaceType() const = 0; - virtual void doIdleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) = 0; + virtual void doIdleUpdate() = 0; virtual BOOL doUpdateGeometry(LLDrawable *drawable) = 0; virtual LLVector3 getPivotPosition() const = 0; virtual void onSetVolume(const LLVolumeParams &volume_params, const S32 detail) = 0; @@ -114,8 +114,7 @@ public: void deleteFaces(); void animateTextures(); - /*virtual*/ BOOL idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time); - + BOOL isVisible() const ; /*virtual*/ BOOL isActive() const; /*virtual*/ BOOL isAttachment() const; |