summaryrefslogtreecommitdiff
path: root/indra/llui/llctrlselectioninterface.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-06-26 00:39:00 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-06-26 00:39:00 +0000
commit25c10ed028da5c547b11f1f461916897272b0e6d (patch)
tree350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/llui/llctrlselectioninterface.cpp
parent6dd125d375b38455997a0c4b8747659f4c2351aa (diff)
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/llui/llctrlselectioninterface.cpp')
-rw-r--r--indra/llui/llctrlselectioninterface.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llctrlselectioninterface.cpp b/indra/llui/llctrlselectioninterface.cpp
index 3dd401973b..589040f345 100644
--- a/indra/llui/llctrlselectioninterface.cpp
+++ b/indra/llui/llctrlselectioninterface.cpp
@@ -53,12 +53,12 @@ BOOL LLCtrlSelectionInterface::deselectByValue(LLSD value)
LLCtrlListInterface::~LLCtrlListInterface()
{ }
-LLScrollListItem* LLCtrlListInterface::addSimpleElement(const LLString& value)
+LLScrollListItem* LLCtrlListInterface::addSimpleElement(const std::string& value)
{
return addSimpleElement(value, ADD_BOTTOM, LLSD());
}
-LLScrollListItem* LLCtrlListInterface::addSimpleElement(const LLString& value, EAddPosition pos)
+LLScrollListItem* LLCtrlListInterface::addSimpleElement(const std::string& value, EAddPosition pos)
{
return addSimpleElement(value, pos, LLSD());
}