diff options
author | brad kittenbrink <brad@lindenlab.com> | 2009-10-07 16:12:56 -0700 |
---|---|---|
committer | brad kittenbrink <brad@lindenlab.com> | 2009-10-07 16:12:56 -0700 |
commit | 146e084af3344ada737340115c5fa063c0aab6b3 (patch) | |
tree | 19e0115569a06f9ec27bd7c482a1066c99afb501 /indra/newview/llviewermedia.cpp | |
parent | d2464757c6fa86caa30a13071cb43047de2dd2ff (diff) | |
parent | 584d0ac64e973da3a9096fb85b796716255988be (diff) |
Merged in latest svn-imports-viewer-20 changes.
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rw-r--r-- | indra/newview/llviewermedia.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index d375e7ee4e..60b3af5ca1 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1397,7 +1397,8 @@ void LLViewerMediaImpl::handleMediaEvent(LLPluginClassMedia* plugin, LLPluginCla { LLSD args; args["PLUGIN"] = LLMIMETypes::implType(mMimeType); - LLNotifications::instance().add("MediaPluginFailed", args); + // SJB: This is getting called every frame if the plugin fails to load, continuously respawining the alert! + //LLNotifications::instance().add("MediaPluginFailed", args); } break; |