summaryrefslogtreecommitdiff
path: root/indra/llui/llbutton.h
diff options
context:
space:
mode:
authorrichard <none@none>2009-11-04 12:02:41 -0800
committerrichard <none@none>2009-11-04 12:02:41 -0800
commit3d6e058616207b287f28ca3eee3967d06cb616ad (patch)
treef093f5507df02e412b71a9b0217176d5e2d18a0d /indra/llui/llbutton.h
parente235b25da31285e6a581c8517c3d7db632bc5919 (diff)
parentc3e9536b6fae9fbd751d4a63e243f502e056175d (diff)
merge
Diffstat (limited to 'indra/llui/llbutton.h')
-rw-r--r--indra/llui/llbutton.h5
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();