diff options
| author | Richard Linden <none@none> | 2010-08-05 13:18:11 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-05 13:18:11 -0700 |
| commit | 9f220e46e5cc9350c64aeb81fc4d89c784f49b33 (patch) | |
| tree | 8ffe0937785a98842d60f25b45fc6045efc1a1fa /indra/newview/llfloatermediabrowser.cpp | |
| parent | d4668787addf870fca0dc1cbf03c756584838261 (diff) | |
| parent | 52936c4ffe97172a5d4926e252f2a25515c47895 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloatermediabrowser.cpp')
| -rw-r--r-- | indra/newview/llfloatermediabrowser.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatermediabrowser.cpp b/indra/newview/llfloatermediabrowser.cpp index c38ef0c014..268a0e0b93 100644 --- a/indra/newview/llfloatermediabrowser.cpp +++ b/indra/newview/llfloatermediabrowser.cpp @@ -129,6 +129,7 @@ BOOL LLFloaterMediaBrowser::postBuild() mAddressCombo = getChild<LLComboBox>("address"); mAddressCombo->setCommitCallback(onEnterAddress, this); + mAddressCombo->sortByName(); childSetAction("back", onClickBack, this); childSetAction("forward", onClickForward, this); @@ -209,7 +210,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 |