diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-10-05 18:14:27 -0700 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-05 18:14:27 -0700 |
| commit | aba67da38b8b983f043b536b9743f80abfb6e33a (patch) | |
| tree | d31382427283f1289615fe409d62e300cc684c48 /indra/newview | |
| parent | 1658d77b865a9e139381a60c7a912ee3b949e69b (diff) | |
FIX DEV-40877: ignore changes from "bad" objects which have an invalid media URL
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/logcontrol.xml | 4 | ||||
| -rw-r--r-- | indra/newview/llmediadataclient.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvovolume.cpp | 24 |
3 files changed, 22 insertions, 8 deletions
diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml index d7bb64ce8a..85cb3cf1b4 100644 --- a/indra/newview/app_settings/logcontrol.xml +++ b/indra/newview/app_settings/logcontrol.xml @@ -25,6 +25,7 @@ <string>AppCache</string> <string>Window</string> <string>RenderInit</string> + <string>MediaOnAPrim</string> </array> </map> <map> @@ -34,12 +35,15 @@ </array> <key>classes</key> <array> + <string>LLMediaDataClient</string> </array> <key>files</key> <array> </array> <key>tags</key> <array> + <string>LLMediaDataClient</string> + <string>MediaOnAPrim</string> </array> </map> </array> diff --git a/indra/newview/llmediadataclient.cpp b/indra/newview/llmediadataclient.cpp index 54521ccb84..c356f55315 100644 --- a/indra/newview/llmediadataclient.cpp +++ b/indra/newview/llmediadataclient.cpp @@ -618,6 +618,6 @@ void LLObjectMediaNavigateClient::Responder::bounceBack() if (mep && impl) { -// impl->navigateTo(mep->getCurrentURL()); + impl->navigateTo(mep->getCurrentURL(), "", false, true); } } diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 583246c23e..428de078de 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -319,13 +319,23 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys, } } } - if (retval & (MEDIA_URL_REMOVED | MEDIA_URL_ADDED | MEDIA_URL_UPDATED | MEDIA_FLAGS_CHANGED)) { - // If the media changed at all, request new media data - if(mMedia) - { - llinfos << "Media URL: " << mMedia->mMediaURL << llendl; - } - requestMediaDataUpdate(); + if (retval & (MEDIA_URL_REMOVED | MEDIA_URL_ADDED | MEDIA_URL_UPDATED | MEDIA_FLAGS_CHANGED)) + { + // If only the media URL changed, and it isn't a media version URL, + // ignore it + if ( ! ( retval & (MEDIA_URL_ADDED | MEDIA_URL_UPDATED) && + mMedia && ! mMedia->mMediaURL.empty() && + ! LLTextureEntry::isMediaVersionString(mMedia->mMediaURL) ) ) + { + // If the media changed at all, request new media data + LL_DEBUGS("MediaOnAPrim") << "Media update: " << getID() << ": retval=" << retval << " Media URL: " << + ((mMedia) ? mMedia->mMediaURL : std::string("")) << LL_ENDL; + requestMediaDataUpdate(); + } + else { + LL_INFOS("MediaOnAPrim") << "Ignoring media update for: " << getID() << " Media URL: " << + ((mMedia) ? mMedia->mMediaURL : std::string("")) << LL_ENDL; + } } // ...and clean up any media impls cleanUpMediaImpls(); |