diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-12-16 11:12:15 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-12-16 11:12:15 -0500 |
commit | ee0055f5af672bef8402679fe8cc41717b0b9678 (patch) | |
tree | d2c025aa4d9469d98a0c8544e1634eedfbad0c84 /indra/newview/lltoolmorph.h | |
parent | ad625861e120cae967d6bc60a9c1f4d86f4c2ed1 (diff) | |
parent | 73962e2134035855def0177db171d8eddaa193cb (diff) |
Automated merge up 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; } |