diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2009-10-05 15:48:00 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2009-10-05 15:48:00 -0700 |
| commit | 374deb8da13c63f80dc1b245488eb254eb86f5d2 (patch) | |
| tree | 9335c64f9b01664c2bd13b4bd8fc170b7a070a0f /indra/llplugin/llpluginclassmediaowner.h | |
| parent | 0c475833994d1b89bbd5a09872eea73c32c8c5c3 (diff) | |
Fixes for a different class of plugin failures (where loading the plugin dll fails) causing an error message loop:
Made LLPluginProcessParent differentiate between failures launching/loading the plugin and failures after the plugin has been loaded. This allows us to handle launch failures differently, since retrying is unlikely to fix them.
Added new media event MEDIA_EVENT_PLUGIN_FAILED_LAUNCH to indicate a launch failure.
Added a case for the new event to LLViewerMediaImpl::handleMediaEvent() that sets the "failed init" flag to prevent retries.
Diffstat (limited to 'indra/llplugin/llpluginclassmediaowner.h')
| -rw-r--r-- | indra/llplugin/llpluginclassmediaowner.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginclassmediaowner.h b/indra/llplugin/llpluginclassmediaowner.h index df6de0925e..cfee847080 100644 --- a/indra/llplugin/llpluginclassmediaowner.h +++ b/indra/llplugin/llpluginclassmediaowner.h @@ -56,7 +56,8 @@ public: MEDIA_EVENT_CLICK_LINK_HREF, // I'm not entirely sure what the semantics of these two are MEDIA_EVENT_CLICK_LINK_NOFOLLOW, - MEDIA_EVENT_PLUGIN_FAILED // The plugin failed to launch or died unexpectedly + MEDIA_EVENT_PLUGIN_FAILED_LAUNCH, // The plugin failed to launch + MEDIA_EVENT_PLUGIN_FAILED // The plugin died unexpectedly } EMediaEvent; |