Merge branch 'develop' into rlva/base

2 files changed, 3 insertions, 3 deletions

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 ea2caaa1c0..8998d965fb 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;
         }