diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-12-20 11:21:17 -0800 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-12-20 11:21:17 -0800 |
commit | dee57bea2526c84fb753abfd08e22c19f1cad21c (patch) | |
tree | 7fbe9a8cbb5957b78a37eb13f58f8b6786ec8cac /indra/newview/lltoolmorph.h | |
parent | 67ca1c0b62cec74495104c0d78fc3743775bfd4e (diff) | |
parent | 25eef545fd7f6513ae4c590126aef1dc06494f56 (diff) |
Merge from viewer-development.
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; } |