diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index feae74e1f0b39c29cbaa4f74255ffd39feb216b3..a7195edd7ddc0f6ba5bd9138b058a13abab7917a 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -1239,7 +1239,14 @@ LLIconsComboBox::LLIconsComboBox(const LLIconsComboBox::Params& p)
const std::string LLIconsComboBox::getSelectedItemLabel(S32 column) const
{
- mButton->setImageOverlay(LLComboBox::getSelectedItemLabel(mIconColumnIndex), mButton->getImageOverlayHAlign());
-
- return LLComboBox::getSelectedItemLabel(mLabelColumnIndex);
+ LLScrollListItem* item = mList->getFirstSelected();
+ if (item)
+ {
+ if (auto columnp = item->getColumn(0))
+ {
+ mButton->setImageOverlay(columnp->getAltValue().asString(), mButton->getImageOverlayHAlign());
+ return columnp->getValue();
+ }
+ }
+ return {};
}
diff --git a/indra/llui/llscrolllistcell.cpp b/indra/llui/llscrolllistcell.cpp
index ccb1610aaa18ec992b69432d78afa146326aca8c..62c3c779f09e44e5be6c2e943e9325903c8f8671 100644
--- a/indra/llui/llscrolllistcell.cpp
+++ b/indra/llui/llscrolllistcell.cpp
@@ -572,6 +572,11 @@ LLScrollListIconText::LLScrollListIconText(const LLScrollListCell::Params& p)
}
const LLSD LLScrollListIconText::getValue() const
+{
+ return LLSD(mText.getString());
+}
+
+const LLSD LLScrollListIconText::getAltValue() const
{
if (mIcon.isNull())
{
diff --git a/indra/llui/llscrolllistcell.h b/indra/llui/llscrolllistcell.h
index 7d684a217e3d6e88b480ec14f8f768f13aa6cb61..f59ea530f7ac1197be2ac5c9b528fe189f66eb77 100644
--- a/indra/llui/llscrolllistcell.h
+++ b/indra/llui/llscrolllistcell.h
@@ -310,6 +310,7 @@ class LLScrollListIconText : public LLScrollListText
/*virtual*/ ~LLScrollListIconText() = default;
/*virtual*/ void draw(const LLColor4& color, const LLColor4& highlight_color) const;
/*virtual*/ const LLSD getValue() const;
+ /*virtual*/ const LLSD getAltValue() const;
/*virtual*/ void setValue(const LLSD& value);
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 6099ac32add05a1f6fe2fee1818e6287cbe0827b..8acd2ff5bfc7a3d8ab7691462613f2cff4eacff3 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -733,7 +733,7 @@ bool LLScrollListCtrl::updateColumnWidths()
{
new_width = (S32)ll_round(column->mRelWidth*mItemListRect.getWidth());
}
- else if (column->mDynamicWidth && mNumDynamicWidthColumns > 0)
+ else if (column->mDynamicWidth)
{
new_width = (mItemListRect.getWidth() - mTotalStaticColumnWidth - mTotalColumnPadding) / mNumDynamicWidthColumns;
}
diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index c5bfaa9da925ba82b8e531b18ce7f12e17f4c80d..3d526cb9c30fecd275bdc519d473e50793c545c5 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -547,32 +547,32 @@
imgoverlay_label_space="3"
pad_left="3"/>
<icons_combo_box.item
- label="Adult"
name="Adult"
value="42">
<item.columns
- halign="center"
- type="icon"
+ halign="left"
+ type="icontext"
+ label="Adult"
value="Parcel_R_Light"
width="20"/>
</icons_combo_box.item>
<icons_combo_box.item
- label="Moderate"
name="Mature"
value="21">
<item.columns
- halign="center"
- type="icon"
+ halign="left"
+ type="icontext"
+ label="Moderate"
value="Parcel_M_Light"
width="20"/>
</icons_combo_box.item>
<icons_combo_box.item
- label="General"
name="PG"
value="13">
<item.columns
- halign="center"
- type="icon"
+ halign="left"
+ type="icontext"
+ label="General"
value="Parcel_PG_Light"
width="20"/>
</icons_combo_box.item>
diff --git a/indra/newview/skins/default/xui/en/panel_experience_search.xml b/indra/newview/skins/default/xui/en/panel_experience_search.xml
index bb07476ad0208d11ddd20ee00e15c52441ebcec2..bd18ec7339ae3d788cbd2acdd8b1e899b1d72fb2 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_search.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_search.xml
@@ -87,32 +87,32 @@
imgoverlay_label_space="3"
pad_left="3"/>
<icons_combo_box.item
- label="Adult"
name="Adult"
value="42">
<item.columns
- halign="center"
- type="icon"
+ halign="left"
+ type="icontext"
+ label="Adult"
value="Parcel_R_Light"
width="20"/>
</icons_combo_box.item>
<icons_combo_box.item
- label="Moderate"
name="Mature"
value="21">
<item.columns
- halign="center"
- type="icon"
+ halign="left"
+ type="icontext"
+ label="Moderate"
value="Parcel_M_Light"
width="20"/>
</icons_combo_box.item>
<icons_combo_box.item
- label="General"
name="PG"
value="13">
<item.columns
- halign="center"
- type="icon"
+ halign="left"
+ type="icontext"
+ label="General"
value="Parcel_PG_Light"
width="20"/>
</icons_combo_box.item>
diff --git a/indra/newview/skins/default/xui/en/panel_profile_classified.xml b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
index 3f22d210f4d12d8bc8f862ef832855dc06156dbe..e0929e3ad40e3fd2000a717e911ab604655738a8 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
@@ -605,26 +605,26 @@
/>
<icons_combo_box.item
name="mature_ci"
- label="Moderate Content"
value="Mature"
>
<item.columns
value="Parcel_M_Light"
width="20"
- halign="center"
- type="icon"
+ halign="left"
+ type="icontext"
+ label="Moderate Content"
/>
</icons_combo_box.item>
<icons_combo_box.item
name="pg_ci"
- label="General Content"
value="PG"
>
<item.columns
value="Parcel_PG_Light"
width="20"
- halign="center"
- type="icon"
+ halign="left"
+ type="icontext"
+ label="General Content"
/>
</icons_combo_box.item>
</icons_combo_box>
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index 74d21c436ec49207f98591251ca21b2af2f40242..b62b830e9ee03dc570446df439c9d3be5676dbfb 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -195,32 +195,32 @@
imgoverlay_label_space="3"
pad_left="3"/>
<icons_combo_box.item
- label="Adult"
name="Adult"
value="42">
<item.columns
- halign="center"
- type="icon"
+ halign="left"
+ type="icontext"
+ label="Adult"
value="Parcel_R_Light"
width="20"/>
</icons_combo_box.item>
<icons_combo_box.item
- label="Moderate"
name="Mature"
value="21">
<item.columns
- halign="center"
- type="icon"
+ halign="left"
+ type="icontext"
+ label="Moderate"
value="Parcel_M_Light"
width="20"/>
</icons_combo_box.item>
<icons_combo_box.item
- label="General"
name="PG"
value="13">
<item.columns
- halign="center"
- type="icon"
+ halign="left"
+ type="icontext"
+ label="General"
value="Parcel_PG_Light"
width="20"/>
</icons_combo_box.item>