diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-07 10:39:05 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-07 10:39:05 -0500 |
| commit | e1e38c4cee980f815091cd94c8a529ffe3e24918 (patch) | |
| tree | 35b16f61bd120f83bb74a77d4417dce1108e0542 /indra/newview/lltoolmorph.h | |
| parent | c02d6a319f378d5dcc34c51b20f556f175d2a40a (diff) | |
| parent | 09c01c4e925833873a83665fe0642637b65e547e (diff) | |
merge changes for storm-34
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; } |