diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
| commit | 07129bf928f79246849e66b396fab44a7a228216 (patch) | |
| tree | e4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/llui/llbutton.h | |
| parent | 03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff) | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
Merge recent changes
Diffstat (limited to 'indra/llui/llbutton.h')
| -rw-r--r-- | indra/llui/llbutton.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h index 1398e5c14b..e387c91a17 100644 --- a/indra/llui/llbutton.h +++ b/indra/llui/llbutton.h @@ -74,7 +74,7 @@ public: { // text label Optional<std::string> label_selected; - Optional<bool> label_dropshadow; + Optional<bool> label_shadow; Optional<bool> auto_resize; // images @@ -105,9 +105,9 @@ public: // callbacks Optional<CommitCallbackParam> click_callback, // alias -> commit_callback - mouse_down_callback, - mouse_up_callback, - mouse_held_callback; + mouse_down_callback, + mouse_up_callback, + mouse_held_callback; // misc Optional<bool> is_toggle, @@ -352,11 +352,5 @@ private: LLFrameTimer mFlashingTimer; }; -#ifdef LL_WINDOWS -#ifndef INSTANTIATE_GETCHILD_BUTTON -#pragma warning (disable : 4231) -extern template LLButton* LLView::getChild<LLButton>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const; -#endif -#endif #endif // LL_LLBUTTON_H |