diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-30 23:22:41 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-30 23:22:41 +0000 |
| commit | e97f7728a90dd66014f6b3f0cd5e8d4c71f48691 (patch) | |
| tree | 4be178df6b50a3395105cdd3ac0044d6467a9fa3 /indra/newview/llchatmsgbox.h | |
| parent | d5aa10143a0e6457b3326ba839c81b7c956a015e (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llchatmsgbox.h')
| -rw-r--r-- | indra/newview/llchatmsgbox.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/indra/newview/llchatmsgbox.h b/indra/newview/llchatmsgbox.h index c0e1964afa..61035499c7 100644 --- a/indra/newview/llchatmsgbox.h +++ b/indra/newview/llchatmsgbox.h @@ -71,9 +71,9 @@ public: background_color, border_color; - Optional<S32> v_pad, - h_pad, - line_spacing; + Optional<S32> line_spacing; + + Optional<S32> block_spacing; Params(); }; @@ -104,8 +104,6 @@ public: void setBackgroundVisible(BOOL visible) { mBackgroundVisible = visible; } void setBorderVisible(BOOL visible) { mBorderVisible = visible; } void setBorderDropshadowVisible(BOOL visible){ mBorderDropShadowVisible = visible; } - void setHPad(S32 pixels) { mHPad = pixels; } - void setVPad(S32 pixels) { mVPad = pixels; } void setRightAlign() { mHAlign = LLFontGL::RIGHT; } void setHAlign( LLFontGL::HAlign align ) { mHAlign = align; } void setClickedCallback( boost::function<void (void*)> cb, void* userdata = NULL ){ mClickedCallback = boost::bind(cb, userdata); } // mouse down and up within button @@ -145,9 +143,8 @@ private: BOOL mUseEllipses; S32 mLineSpacing; + S32 mBlockSpasing; - S32 mHPad; - S32 mVPad; LLFontGL::HAlign mHAlign; LLFontGL::VAlign mVAlign; |