summaryrefslogtreecommitdiff
path: root/indra/llplugin/llpluginclassmedia.cpp
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2010-11-17 16:01:46 -0800
committerMonroe Linden <monroe@lindenlab.com>2010-11-17 16:01:46 -0800
commit9d82af29df47e731749f9a346a630356975153d2 (patch)
tree53cbec45d7b725bdb3ce509b9be9ec10ff320807 /indra/llplugin/llpluginclassmedia.cpp
parent39f6086a3ae01cc40cb1f871b0dbd4c79b0a00e3 (diff)
SOCIAL-233 WIP Better performance (improve loading time of webkit instance)
The plugin system will now keep a spare running webkit plugin process around and use it when it needs a webkit instance. This should hide some large portion of the setup time when creating a new webkit plugin (i.e. opening the search window, etc.)
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.cpp')
-rw-r--r--indra/llplugin/llpluginclassmedia.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index cd0689caa6..4001cb183f 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) || (mPlugin->isBlocked()))
+ if((mMediaWidth == -1) || (!mTextureParamsReceived) || (mPlugin == NULL) || (mPlugin->isBlocked()) || (mOwner == NULL))
{
// Can't process a size change at this time
}