diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:43:26 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:43:26 -0500 |
commit | 05810f063dbe0ed87d03ea41c7d8fdc423945c6e (patch) | |
tree | 311355a1679ef47fa1951788319e0c521a188edd /indra/newview/lltoolmorph.h | |
parent | 5e376017858f6534163b0bfb6b385bdd0aeac5d3 (diff) | |
parent | e4591a85182133811e327b579c558bb3db80d79e (diff) |
merge changes for storm-737
Diffstat (limited to 'indra/newview/lltoolmorph.h')
-rw-r--r-- | indra/newview/lltoolmorph.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoolmorph.h b/indra/newview/lltoolmorph.h index 59201233ae..a6889be151 100644 --- a/indra/newview/lltoolmorph.h +++ b/indra/newview/lltoolmorph.h @@ -68,7 +68,7 @@ public: BOOL render(); void requestUpdate( S32 delay_frames ) {mNeedsUpdate = TRUE; mDelayFrames = delay_frames; } void setUpdateDelayFrames( S32 delay_frames ) { mDelayFrames = delay_frames; } - void draw(); + void draw(F32 alpha); LLViewerVisualParam* getVisualParam() { return mVisualParam; } F32 getVisualParamWeight() { return mVisualParamWeight; } |