From 96e2aaf88f8b40122ad484605fbfbef292817ba4 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 26 Feb 2009 21:21:51 -0700 Subject: Fixed bad LM patch side-effect --- ChangeLog.txt | 6 ++++++ linden/indra/llaudio/audioengine.cpp | 1 + linden/indra/llmedia/llmediaimplgstreamer.cpp | 2 +- linden/indra/newview/llpreviewlandmark.cpp | 12 +++++++++++- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 2e3dab5..6218f34 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,9 @@ +2009-02-26 McCabe Maxsted + + * linden/indra/newview/llpreviewlandmark.cpp: + Fixed bad LM patch side-effect. + + 2009-02-25 McCabe Maxsted * linden/indra/newview/skins/default/xui/en-us/menu_pie_hud.xml: diff --git a/linden/indra/llaudio/audioengine.cpp b/linden/indra/llaudio/audioengine.cpp index 400e938..7bb65e9 100644 --- a/linden/indra/llaudio/audioengine.cpp +++ b/linden/indra/llaudio/audioengine.cpp @@ -201,6 +201,7 @@ void LLAudioEngine::startInternetStream(const std::string& url) // Check for a dead stream, just in case if(getStatus() == LLMediaBase::STATUS_DEAD) { + LL_INFOS("AudioEngine") << "don't play dead stream urls"<< llendl; mInternetStreamURL.clear(); mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP); mInternetStreamMedia->updateMedia(); diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp index ece3fb0..af089bc 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer.cpp +++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp @@ -449,7 +449,7 @@ bool LLMediaImplGStreamer::unload() mVideoSink = NULL; mState = GST_STATE_NULL; - setStatus(LLMediaBase::STATUS_DEAD); + setStatus(LLMediaBase::STATUS_UNKNOWN); return true; } diff --git a/linden/indra/newview/llpreviewlandmark.cpp b/linden/indra/newview/llpreviewlandmark.cpp index 01d77f6..20b0ee5 100644 --- a/linden/indra/newview/llpreviewlandmark.cpp +++ b/linden/indra/newview/llpreviewlandmark.cpp @@ -90,7 +90,17 @@ LLPreviewLandmark::LLPreviewLandmark(const std::string& name, { mFactoryMap["place_details_panel"] = LLCallbackMap(LLPreviewLandmark::createPlaceDetail, this); - LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_existing_landmark.xml", &getFactoryMap()); + if (show_keep_discard) + { + // Decided against this, a text notification is a better fix for this -- McCabe + //LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_new_landmark.xml", &getFactoryMap()); + //childSetAction("Discard btn",onDiscardBtn,this); + } + else + { + LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_existing_landmark.xml", &getFactoryMap()); + } + /* childSetCommitCallback("desc_editor", LLPreview::onText, this); -- cgit v1.1