diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-29 11:32:42 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-29 11:32:42 +0100 |
| commit | fee6f311d310dccfa3ae5f28a9911a2d5b7e7d62 (patch) | |
| tree | b8ba490183411702dca18cde30ad6e70dff2a2d5 /indra/llplugin/llpluginclassmedia.cpp | |
| parent | 8413842ff763f0a6b8a8d7e5ff51989e42a4d148 (diff) | |
| parent | a0527cb6f728a2814fdf8b0fa6f149c7041efcac (diff) | |
merge from viewer-trunk
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.cpp')
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index e09b511a6e..0c9b325b68 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -160,7 +160,7 @@ void LLPluginClassMedia::idle(void) mPlugin->idle(); } - if((mMediaWidth == -1) || (!mTextureParamsReceived) || (mPlugin == NULL)) + if((mMediaWidth == -1) || (!mTextureParamsReceived) || (mPlugin == NULL) || (mPlugin->isBlocked())) { // Can't process a size change at this time } @@ -437,6 +437,12 @@ void LLPluginClassMedia::mouseEvent(EMouseEventType type, int button, int x, int { if(type == MOUSE_EVENT_MOVE) { + if(!mPlugin || !mPlugin->isRunning() || mPlugin->isBlocked()) + { + // Don't queue up mouse move events that can't be delivered. + return; + } + if((x == mLastMouseX) && (y == mLastMouseY)) { // Don't spam unnecessary mouse move events. |