From 25c10ed028da5c547b11f1f461916897272b0e6d Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 26 Jun 2008 00:39:00 +0000 Subject: QAR-628 merge string-cleanup-5 -r 90476:90508 -> release dataserver-is-deprecated --- indra/llui/llctrlselectioninterface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llui/llctrlselectioninterface.cpp') 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()); } -- cgit v1.2.3