diff options
| author | richard <none@none> | 2009-11-04 10:42:23 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-11-04 10:42:23 -0800 |
| commit | 5bcd24a01df7cb6cdeb78ab742fb54ce75fb6d13 (patch) | |
| tree | 081e318f5e7f56fad5687bdc053f7fb38ed3d3b0 /indra/llui/llbutton.h | |
| parent | 70207cb0529d528f7eac67b63d72630107d190b1 (diff) | |
| parent | 0ee426016aeae605eeb8ab3aa535b2b52462a3d9 (diff) | |
merge
Diffstat (limited to 'indra/llui/llbutton.h')
| -rw-r--r-- | indra/llui/llbutton.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h index 85580a98bf..08f289092f 100644 --- a/indra/llui/llbutton.h +++ b/indra/llui/llbutton.h @@ -115,8 +115,7 @@ public: // misc Optional<bool> is_toggle, scale_image, - commit_on_return, - picture_style; //if true, don't display label + commit_on_return; Optional<F32> hover_glow_amount; Optional<TimeIntervalParam> held_down_delay; @@ -247,8 +246,6 @@ protected: LLFrameTimer mMouseDownTimer; - // If the label is empty, set the picture_style attribute - static void setupParamsForExport(Params& p, LLView* parent); private: void drawBorder(LLUIImage* imagep, const LLColor4& color, S32 size); void resetMouseDownTimer(); |