diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-29 15:24:09 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-29 15:24:09 +0300 |
| commit | 7d0769f3e1979d12b8cf55e0f5312fecade49bee (patch) | |
| tree | bc35fbf959a358315358722943a4bfd7b213850c /indra/llplugin/llpluginclassmedia.cpp | |
| parent | 4eb741883cbee15e28272677bcb9b58dce85ee42 (diff) | |
| parent | 8c3feea2a2f3bcb648f712f63ea9c4dab8aaa0c3 (diff) | |
Merge from default branch
--HG--
branch : product-engine
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. |