summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermediabrowser.cpp
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-08-04 19:01:18 -0700
committerRichard Nelson <none@none>2010-08-04 19:01:18 -0700
commit5062351a0a2a95c3cbca27297b57afddc23d7a4f (patch)
tree5906c7f0b461b7671bcdaa35d284e73f40517095 /indra/newview/llfloatermediabrowser.cpp
parentbd20eddd4ecf185d0fe2ff2dc498809ad104cfcc (diff)
deprecated ADD_SORTED due to n^2 behavior, set the sort order on the scroll list instead
Diffstat (limited to 'indra/newview/llfloatermediabrowser.cpp')
-rw-r--r--indra/newview/llfloatermediabrowser.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatermediabrowser.cpp b/indra/newview/llfloatermediabrowser.cpp
index 5405de2f9a..d01488b6b1 100644
--- a/indra/newview/llfloatermediabrowser.cpp
+++ b/indra/newview/llfloatermediabrowser.cpp
@@ -105,6 +105,7 @@ BOOL LLFloaterMediaBrowser::postBuild()
mAddressCombo = getChild<LLComboBox>("address");
mAddressCombo->setCommitCallback(onEnterAddress, this);
+ mAddressCombo->sortByName();
childSetAction("back", onClickBack, this);
childSetAction("forward", onClickForward, this);
@@ -185,7 +186,7 @@ void LLFloaterMediaBrowser::setCurrentURL(const std::string& url)
if (mCurrentURL != "about:blank")
{
mAddressCombo->remove(mCurrentURL);
- mAddressCombo->add(mCurrentURL, ADD_SORTED);
+ mAddressCombo->add(mCurrentURL);
mAddressCombo->selectByValue(mCurrentURL);
// Serialize url history