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/newview/llnamelistctrl.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/newview/llnamelistctrl.cpp')
-rw-r--r-- | linden/indra/newview/llnamelistctrl.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/llnamelistctrl.cpp b/linden/indra/newview/llnamelistctrl.cpp index baf0656..453cf7f 100644 --- a/linden/indra/newview/llnamelistctrl.cpp +++ b/linden/indra/newview/llnamelistctrl.cpp | |||
@@ -288,6 +288,8 @@ LLXMLNodePtr LLNameListCtrl::getXML(bool save_children) const | |||
288 | { | 288 | { |
289 | LLXMLNodePtr node = LLScrollListCtrl::getXML(); | 289 | LLXMLNodePtr node = LLScrollListCtrl::getXML(); |
290 | 290 | ||
291 | node->setName(LL_NAME_LIST_CTRL_TAG); | ||
292 | |||
291 | node->createChild("allow_calling_card_drop", TRUE)->setBoolValue(mAllowCallingCardDrop); | 293 | node->createChild("allow_calling_card_drop", TRUE)->setBoolValue(mAllowCallingCardDrop); |
292 | 294 | ||
293 | if (mNameColumnIndex != 0) | 295 | if (mNameColumnIndex != 0) |