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/llcheckboxctrl.cpp | |
| 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 'linden/indra/llui/llcheckboxctrl.cpp')
| -rw-r--r-- | linden/indra/llui/llcheckboxctrl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/llui/llcheckboxctrl.cpp b/linden/indra/llui/llcheckboxctrl.cpp index eda9467..c1daee7 100644 --- a/linden/indra/llui/llcheckboxctrl.cpp +++ b/linden/indra/llui/llcheckboxctrl.cpp | |||
| @@ -298,12 +298,13 @@ void LLCheckBoxCtrl::resetDirty() | |||
| 298 | } | 298 | } |
| 299 | 299 | ||
| 300 | 300 | ||
| 301 | |||
| 302 | // virtual | 301 | // virtual |
| 303 | LLXMLNodePtr LLCheckBoxCtrl::getXML(bool save_children) const | 302 | LLXMLNodePtr LLCheckBoxCtrl::getXML(bool save_children) const |
| 304 | { | 303 | { |
| 305 | LLXMLNodePtr node = LLUICtrl::getXML(); | 304 | LLXMLNodePtr node = LLUICtrl::getXML(); |
| 306 | 305 | ||
| 306 | node->setName(LL_CHECK_BOX_CTRL_TAG); | ||
| 307 | |||
| 307 | node->createChild("label", TRUE)->setStringValue(mLabel->getText()); | 308 | node->createChild("label", TRUE)->setStringValue(mLabel->getText()); |
| 308 | 309 | ||
| 309 | std::string control_name = mButton->getControlName(); | 310 | std::string control_name = mButton->getControlName(); |