diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-20 17:12:30 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-20 17:12:30 +0200 |
| commit | f4b8822aca5aeebaed56b4bfa3b762b3aa7d0640 (patch) | |
| tree | 698944df6f944aa50ab446be91381f6789f6acb7 /indra/media_plugins | |
| parent | 086135b6849bad2e3a5ddcf9bb9540fdb6fb72dd (diff) | |
| parent | f2af69c993190fcac87b91e299321fea9751444d (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/media_plugins')
| -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. |