diff options
| author | Jacek Antonelli | 2010-01-26 13:02:07 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2010-01-26 14:25:07 -0600 |
| commit | 6e1e243da8c06ddd6847576c55e134d72ef42491 (patch) | |
| tree | 3cd1bfbd60d3b92323717afda3fa5a821cf4066c /linden/indra/llui/llcombobox.h | |
| parent | ChangeLog entry: Several changes to work better on 64bit Linux. (diff) | |
| parent | SNOW-413 Potential null pointer exception in multi-slider control (diff) | |
| download | meta-impy-6e1e243da8c06ddd6847576c55e134d72ef42491.zip meta-impy-6e1e243da8c06ddd6847576c55e134d72ef42491.tar.gz meta-impy-6e1e243da8c06ddd6847576c55e134d72ef42491.tar.bz2 meta-impy-6e1e243da8c06ddd6847576c55e134d72ef42491.tar.xz | |
Merged bug fixes by Mm Alder and Admiral Admiral.
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llui/llcombobox.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/llui/llcombobox.h b/linden/indra/llui/llcombobox.h index 33e1baa..95ad17a 100644 --- a/linden/indra/llui/llcombobox.h +++ b/linden/indra/llui/llcombobox.h | |||
| @@ -217,6 +217,7 @@ public: | |||
| 217 | 217 | ||
| 218 | void setToggleState(BOOL state); | 218 | void setToggleState(BOOL state); |
| 219 | 219 | ||
| 220 | virtual LLXMLNodePtr getXML(bool save_children = true) const; | ||
| 220 | static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); | 221 | static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); |
| 221 | static void onActionButtonClick(void *userdata); | 222 | static void onActionButtonClick(void *userdata); |
| 222 | static void onSelectAction(LLUICtrl* ctrl, void *userdata); | 223 | static void onSelectAction(LLUICtrl* ctrl, void *userdata); |