diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-08-23 09:19:59 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-08-23 09:19:59 -0400 |
| commit | bcf5dc079a5dc9434b541a971e28315fa5cb9816 (patch) | |
| tree | 16f6b186d704ca9682bcbfcb8aca1e29ef85b103 /indra/llplugin | |
| parent | fa53653e60f5761c157b76423b4449fe38788d8f (diff) | |
| parent | 08cbed55ef5689fcc5a02dfb3b9afde15487036e (diff) | |
merge changes for 5.0.7-release
Diffstat (limited to 'indra/llplugin')
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index f1b6fe0a12..680017204c 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -224,7 +224,14 @@ void LLPluginClassMedia::idle(void) void *addr = mPlugin->getSharedMemoryAddress(mTextureSharedMemoryName); // clear texture memory to avoid random screen visual fuzz from uninitialized texture data - memset( addr, 0x00, newsize ); + if (addr) + { + memset( addr, 0x00, newsize ); + } + else + { + LL_WARNS("Plugin") << "Failed to get previously created shared memory address: " << mTextureSharedMemoryName << " size: " << mTextureSharedMemorySize << LL_ENDL; + } // We could do this to force an update, but textureValid() will still be returning false until the first roundtrip to the plugin, // so it may not be worthwhile. |