diff options
author | Jacek Antonelli | 2008-11-22 02:44:13 -0600 |
---|---|---|
committer | Jacek Antonelli | 2008-11-22 03:00:44 -0600 |
commit | 4a110d27db60dc7c065b8d7b6a5569281838888f (patch) | |
tree | 87fd945753c9e54a73323de939c113876c97239d | |
parent | Renamed "Clothing" filter to "Clothing / Body Parts". (diff) | |
download | meta-impy-4a110d27db60dc7c065b8d7b6a5569281838888f.zip meta-impy-4a110d27db60dc7c065b8d7b6a5569281838888f.tar.gz meta-impy-4a110d27db60dc7c065b8d7b6a5569281838888f.tar.bz2 meta-impy-4a110d27db60dc7c065b8d7b6a5569281838888f.tar.xz |
Combobox widget now supports separators in XUI.
-rw-r--r-- | ChangeLog.txt | 4 | ||||
-rw-r--r-- | linden/indra/llui/llcombobox.cpp | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index c2cd0ba..787f659 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,5 +1,9 @@ | |||
1 | 2008-11-22 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2008-11-22 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 2 | ||
3 | * linden/indra/llui/llcombobox.cpp: | ||
4 | Combobox now supports separators in XUI. | ||
5 | |||
6 | |||
3 | * linden/indra/newview/llinventoryview.cpp: | 7 | * linden/indra/newview/llinventoryview.cpp: |
4 | Renamed "Clothing" filter to "Clothing / Body Parts". | 8 | Renamed "Clothing" filter to "Clothing / Body Parts". |
5 | * linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml: | 9 | * linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml: |
diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp index 9a2e13b..cb9dd4e 100644 --- a/linden/indra/llui/llcombobox.cpp +++ b/linden/indra/llui/llcombobox.cpp | |||
@@ -194,6 +194,11 @@ LLView* LLComboBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory * | |||
194 | 194 | ||
195 | combo_box->add(label, LLSD(value) ); | 195 | combo_box->add(label, LLSD(value) ); |
196 | } | 196 | } |
197 | |||
198 | else if (child->hasName("separator")) | ||
199 | { | ||
200 | combo_box->addSeparator(); | ||
201 | } | ||
197 | } | 202 | } |
198 | } | 203 | } |
199 | 204 | ||