diff options
| author | Justin C. Rounds (Chuck) <chuck@lindenlab.com> | 2009-10-29 17:19:10 -0400 |
|---|---|---|
| committer | Justin C. Rounds (Chuck) <chuck@lindenlab.com> | 2009-10-29 17:19:10 -0400 |
| commit | 233773561851ad6e22b4a4e8f69ef8ba67a809d2 (patch) | |
| tree | eaf4a7a8a2c5589c1d1a68985aab47f4c05f704a | |
| parent | a36b3baa96fca0fcf12ef9b09db4a5e625b1a476 (diff) | |
| parent | 0595c97f69ae6229d0a261ce5560500b88cd55cc (diff) | |
Merge commit.
| -rw-r--r-- | indra/newview/llpanelprimmediacontrols.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index ca7ebb1ad8..cbff13a20f 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -1000,6 +1000,7 @@ void LLPanelPrimMediaControls::onInputURL(LLFocusableElement* caller, void *user void LLPanelPrimMediaControls::setCurrentURL() { +#ifdef USE_COMBO_BOX_FOR_MEDIA_URL LLComboBox* media_address_combo = getChild<LLComboBox>("media_address_combo"); // redirects will navigate momentarily to about:blank, don't add to history if (media_address_combo && mCurrentURL != "about:blank") @@ -1008,6 +1009,13 @@ void LLPanelPrimMediaControls::setCurrentURL() media_address_combo->add(mCurrentURL, ADD_SORTED); media_address_combo->selectByValue(mCurrentURL); } +#else // USE_COMBO_BOX_FOR_MEDIA_URL + LLLineEditor* media_address_url = getChild<LLLineEditor>("media_address_url"); + if (media_address_url && mCurrentURL != "about:blank") + { + media_address_url->setValue(mCurrentURL); + } +#endif // USE_COMBO_BOX_FOR_MEDIA_URL } void LLPanelPrimMediaControls::onCommitSlider() |