diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-01-14 16:35:33 -0800 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-01-14 16:35:33 -0800 |
commit | 3b55ac4fbbee79533ce5952d326dad3ec071dd8b (patch) | |
tree | 316656b7bec16901bdaa2520b330892aff482632 /indra/newview/llviewermedia.h | |
parent | 6ede6f0c9c0aa56c78675c555aba05327bd2739b (diff) |
Fix for EXT-4207 (Viewer crash clicking on an object that starts a script that navigates in a while(1) loop)
Don't allow LLViewerMediaImpl to process a navigateInternal during the call to LLPluginClassMedia::idle(). This prevents untimely destruction of the LLPluginClassMedia and LLPluginMessagePipe objects, which was causing the crash.
Reviewed by Rick.
Diffstat (limited to 'indra/newview/llviewermedia.h')
-rw-r--r-- | indra/newview/llviewermedia.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index 8a5cd804aa..668f3b563d 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -326,6 +326,9 @@ public: EMediaNavState getNavState() { return mMediaNavState; } void setNavState(EMediaNavState state); + void setNavigateSuspended(bool suspend); + bool isNavigateSuspended() { return mNavigateSuspended; }; + void cancelMimeTypeProbe(); private: // a single media url with some data and an impl. @@ -372,6 +375,8 @@ private: bool mInNearbyMediaList; // used by LLFloaterNearbyMedia::refreshList() for performance reasons bool mClearCache; LLColor4 mBackgroundColor; + bool mNavigateSuspended; + bool mNavigateSuspendedDeferred; private: BOOL mIsUpdated ; |