diff options
author | Oz Linden <oz@lindenlab.com> | 2010-12-14 14:44:23 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-12-14 14:44:23 -0500 |
commit | 3aa12e85f04f0608da5df05b2cbb01685ef62944 (patch) | |
tree | 02e78886d530c92e3eddf0f73f3eb7f8a5b641da /indra/newview/lltoolmorph.h | |
parent | bae83c7eac98229271a6baf4c961fe167c74a597 (diff) | |
parent | a702b34394e4b38b27338eb6d68d22b498984118 (diff) |
merge fix(es) for storm-378
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; } |