diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-04-21 17:04:27 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-04-21 17:04:27 -0700 |
| commit | 144b8349b3f0773ac575e178a0e3109d963be9a8 (patch) | |
| tree | f22283a212ed0e579531f22453ed952b3330eba2 /indra/llvfs/lldir_mac.cpp | |
| parent | bb25b1961108dd8c43d610d5680601bd36159836 (diff) | |
Fix for EXT-6287 (fullscreen flash video plays behind the viewer instead of in front)
Made SLPlugin into a bundled app on the Mac (this is apparently necessary for the plugin's window to be allowed to get focus).
Changed the Info.plist key SLPlugin uses to keep itself out of the dock from LSBackgroundOnly to LSUIElement (this allows it to get focus and display UI).
Added some Mac-specific code to slplugin.cpp to manipulate window layers and bring the plugin process to the foreground when something in the process opens a window, and to bring the viewer to the foreground when the last window in the process is closed.
Diffstat (limited to 'indra/llvfs/lldir_mac.cpp')
| -rw-r--r-- | indra/llvfs/lldir_mac.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp index 7bc6f63e1f..8d3852002c 100644 --- a/indra/llvfs/lldir_mac.cpp +++ b/indra/llvfs/lldir_mac.cpp @@ -426,7 +426,7 @@ BOOL LLDir_Mac::fileExists(const std::string &filename) const /*virtual*/ std::string LLDir_Mac::getLLPluginLauncher() { return gDirUtilp->getAppRODataDir() + gDirUtilp->getDirDelimiter() + - "SLPlugin"; + "SLPlugin.app/Contents/MacOS/SLPlugin"; } /*virtual*/ std::string LLDir_Mac::getLLPluginFilename(std::string base_name) |