diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llpanellandmedia.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/linden/indra/newview/llpanellandmedia.cpp b/linden/indra/newview/llpanellandmedia.cpp index bebd69e..11f491c 100644 --- a/linden/indra/newview/llpanellandmedia.cpp +++ b/linden/indra/newview/llpanellandmedia.cpp | |||
@@ -358,13 +358,21 @@ void LLPanelLandMedia::setMediaType(const std::string& mime_type) | |||
358 | 358 | ||
359 | std::string media_key = LLMIMETypes::widgetType(mime_type); | 359 | std::string media_key = LLMIMETypes::widgetType(mime_type); |
360 | mMediaTypeCombo->setValue(media_key); | 360 | mMediaTypeCombo->setValue(media_key); |
361 | |||
361 | childSetText("mime_type", mime_type); | 362 | childSetText("mime_type", mime_type); |
362 | } | 363 | } |
363 | 364 | ||
364 | void LLPanelLandMedia::setMediaURL(const std::string& media_url) | 365 | void LLPanelLandMedia::setMediaURL(const std::string& media_url) |
365 | { | 366 | { |
366 | mMediaURLEdit->setText(media_url); | 367 | mMediaURLEdit->setText(media_url); |
368 | LLParcel *parcel = mParcel->getParcel(); | ||
369 | if(parcel) | ||
370 | parcel->setMediaCurrentURL(media_url); | ||
371 | // LLViewerMedia::navigateHome(); | ||
372 | |||
367 | mMediaURLEdit->onCommit(); | 373 | mMediaURLEdit->onCommit(); |
374 | // // LLViewerParcelMedia::sendMediaNavigateMessage(media_url); | ||
375 | // childSetText("current_url", media_url); | ||
368 | } | 376 | } |
369 | 377 | ||
370 | std::string LLPanelLandMedia::getMediaURL() | 378 | std::string LLPanelLandMedia::getMediaURL() |
@@ -452,4 +460,4 @@ void LLPanelLandMedia::onSetBtn(void *userdata) | |||
452 | { | 460 | { |
453 | parent_floater->addDependentFloater(self->mURLEntryFloater.get()); | 461 | parent_floater->addDependentFloater(self->mURLEntryFloater.get()); |
454 | } | 462 | } |
455 | } | 463 | } \ No newline at end of file |