From 49a2c136f99cf90abc94f1ce84d3c6f2be2815d0 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 25 Sep 2024 21:35:20 +0300
Subject: viewer#2646 Fix viewer ignoring Physics Shape Type changes
asStringRef is only valid for strings
---
indra/llui/llcombobox.cpp | 2 +-
indra/llui/llscrolllistctrl.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'indra')
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index a1c16ccdec..f3876ef695 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -365,7 +365,7 @@ void LLComboBox::setValue(const LLSD& value)
if (LLScrollListItem* item = mList->getFirstSelected())
{
LLSD item_value = item->getValue();
- if (item_value.asStringRef() == value.asStringRef())
+ if (item_value.asString() == value.asString())
return;
}
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 445377d3a2..93bd3c6bed 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -490,12 +490,12 @@ std::vector<LLScrollListItem*> LLScrollListCtrl::getAllData() const
// returns first matching item
LLScrollListItem* LLScrollListCtrl::getItem(const LLSD& sd) const
{
- const std::string& string_val = sd.asStringRef();
+ std::string string_val = sd.asString();
for (LLScrollListItem* item : mItemList)
{
// assumes string representation is good enough for comparison
- if (item->getValue().asStringRef() == string_val)
+ if (item->getValue().asString() == string_val)
{
return item;
}
--
cgit v1.2.3