diff options
author | Richard Linden <none@none> | 2011-11-07 11:15:40 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2011-11-07 11:15:40 -0800 |
commit | 32dca99fe59196fa4a92a815b441b4e6e9f747f0 (patch) | |
tree | 6a257d591ad0f241c7fbd42acca72ea79e4c9cf6 /indra/newview/llfloatertoybox.h | |
parent | 8f47f2222c207938c8fc55158a6fff64ccf1e781 (diff) | |
parent | d6d4bfa02a46c5c7f2e5376b9fad79f2624dda83 (diff) |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llfloatertoybox.h')
-rw-r--r-- | indra/newview/llfloatertoybox.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloatertoybox.h b/indra/newview/llfloatertoybox.h index 6f0275b8fe..10aee0e6f5 100644 --- a/indra/newview/llfloatertoybox.h +++ b/indra/newview/llfloatertoybox.h @@ -50,6 +50,7 @@ public: std::string& tooltip_msg); protected: + void onBtnClearAll(); void onBtnRestoreDefaults(); void onToolBarButtonEnter(LLView* button); |