diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-12 01:12:27 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-12 01:12:27 +0000 |
| commit | 0bf4b5f2222ffb8171be094613363427f3b8470a (patch) | |
| tree | 4b742d6815f44a85c98113e9c5a3017eafc5968d /indra/llui/llbutton.h | |
| parent | 8d7e56f219d0915e2c4a19baf2809dbc6ede7fa5 (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0
Fixes:
EXT 208 EXT 366 EXT-211 EXT-245 EXT-246 EXT-278 EXT-279 EXT-280 EXT-298 EXT-301 EXT-304 EXT-311 EXT-317 EXT-318 EXT-319 EXT-339 EXT-343 EXT-344 EXT-346 EXT-349 EXT-350 EXT-351 EXT-354 EXT-355 EXT-358 EXT-360 EXT-362 EXT-369 EXT-372 EXT-374 EXT-381 EXT-382 EXT-383 EXT-395 EXT-396 EXT-412
Other changes:
Movement & Caemra controls work
Profile and Me panel refactoring
Notification refactoring
Diffstat (limited to 'indra/llui/llbutton.h')
| -rw-r--r-- | indra/llui/llbutton.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h index 93e0414a02..249882013a 100644 --- a/indra/llui/llbutton.h +++ b/indra/llui/llbutton.h @@ -76,6 +76,7 @@ public: Optional<std::string> label_selected; Optional<bool> label_shadow; Optional<bool> auto_resize; + Optional<bool> use_ellipses; // images Optional<LLUIImage*> image_unselected, @@ -152,14 +153,14 @@ public: void setUnselectedLabelColor( const LLColor4& c ) { mUnselectedLabelColor = c; } void setSelectedLabelColor( const LLColor4& c ) { mSelectedLabelColor = c; } + void setUseEllipses( BOOL use_ellipses ) { mUseEllipses = use_ellipses; } + boost::signals2::connection setClickedCallback( const commit_signal_t::slot_type& cb ); // mouse down and up within button boost::signals2::connection setMouseDownCallback( const commit_signal_t::slot_type& cb ); boost::signals2::connection setMouseUpCallback( const commit_signal_t::slot_type& cb ); // mouse up, EVEN IF NOT IN BUTTON // Passes a 'count' parameter in the commit param payload, i.e. param["count"]) boost::signals2::connection setHeldDownCallback( const commit_signal_t::slot_type& cb ); // Mouse button held down and in button - boost::signals2::connection setRightClickedCallback( const commit_signal_t::slot_type& cb ); // right mouse down and up within button - // *TODO: Deprecate (for backwards compatability only) @@ -297,6 +298,7 @@ private: BOOL mDropShadowedText; BOOL mAutoResize; + BOOL mUseEllipses; BOOL mBorderEnabled; BOOL mFlashing; |