diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-01-19 14:31:27 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-01-19 14:31:27 -0800 |
| commit | c3b8a84d3c8cbb0df0e0ed0c56d876ac9b63f7b7 (patch) | |
| tree | 9af859ead298b3587768d4640df56974adb19f2a /indra | |
| parent | b35a682ec77018e0a2e7b5f91ec8972f0955012a (diff) | |
Workaround for "Stop on Debugger()/DebugStr()" Xcode setting causing the webkit plugin to crash.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index 084cdd9561..42d680ade6 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -175,6 +175,15 @@ private: } std::string application_dir = std::string( cwd ); +#if LL_DARWIN + // When running under the Xcode debugger, there's a setting called "Break on Debugger()/DebugStr()" which defaults to being turned on. + // This causes the environment variable USERBREAK to be set to 1, which causes these legacy calls to break into the debugger. + // This wouldn't cause any problems except for the fact that the current release version of the Flash plugin has a call to Debugger() in it + // which gets hit when the plugin is probed by webkit. + // Unsetting the environment variable here works around this issue. + unsetenv("USERBREAK"); +#endif + #if LL_WINDOWS //*NOTE:Mani - On windows, at least, the component path is the // location of this dll's image file. |