diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-08-09 17:05:53 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-08-09 17:05:53 -0700 |
| commit | 011c3686a6e10edfe40adb67105298033188c1d6 (patch) | |
| tree | 8e45584e245d4f31429703a52da2bf0124d93d04 /indra/newview/llpanelprimmediacontrols.cpp | |
| parent | bd708f82bd3b87051e03a2794ce417ae6f432c08 (diff) | |
| parent | a11a8c4027eb949c8a33951b9e8c7475e59a2eeb (diff) | |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.cpp')
| -rw-r--r-- | indra/newview/llpanelprimmediacontrols.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index 9cc775d427..583b41aa57 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -1178,7 +1178,7 @@ void LLPanelPrimMediaControls::setCurrentURL() // if (media_address_combo && mCurrentURL != "about:blank") // { // media_address_combo->remove(mCurrentURL); -// media_address_combo->add(mCurrentURL, ADD_SORTED); +// media_address_combo->add(mCurrentURL); // media_address_combo->selectByValue(mCurrentURL); // } #else // USE_COMBO_BOX_FOR_MEDIA_URL |