diff options
| author | Jacek Antonelli | 2010-11-13 23:13:21 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2010-11-14 02:08:25 -0600 |
| commit | ecec32deaff66550dd79b16104353ffee9a9039c (patch) | |
| tree | 740fdcbbea43afd0286dc128c6e97efeb2f0a2df /linden/indra | |
| parent | Commented out gstreamer libs from Mac manifest. (diff) | |
| download | meta-impy-ecec32deaff66550dd79b16104353ffee9a9039c.zip meta-impy-ecec32deaff66550dd79b16104353ffee9a9039c.tar.gz meta-impy-ecec32deaff66550dd79b16104353ffee9a9039c.tar.bz2 meta-impy-ecec32deaff66550dd79b16104353ffee9a9039c.tar.xz | |
Fixed path to Mac SLPlugin launcher.
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/llvfs/lldir_mac.cpp | 2 | ||||
| -rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/llvfs/lldir_mac.cpp b/linden/indra/llvfs/lldir_mac.cpp index 29cac58..6f0b037 100644 --- a/linden/indra/llvfs/lldir_mac.cpp +++ b/linden/indra/llvfs/lldir_mac.cpp | |||
| @@ -393,7 +393,7 @@ BOOL LLDir_Mac::fileExists(const std::string &filename) const | |||
| 393 | /*virtual*/ std::string LLDir_Mac::getLLPluginLauncher() | 393 | /*virtual*/ std::string LLDir_Mac::getLLPluginLauncher() |
| 394 | { | 394 | { |
| 395 | return gDirUtilp->getAppRODataDir() + gDirUtilp->getDirDelimiter() + | 395 | return gDirUtilp->getAppRODataDir() + gDirUtilp->getDirDelimiter() + |
| 396 | "SLPlugin"; | 396 | "SLPlugin.app/Contents/MacOS/SLPlugin"; |
| 397 | } | 397 | } |
| 398 | 398 | ||
| 399 | /*virtual*/ std::string LLDir_Mac::getLLPluginFilename(std::string base_name) | 399 | /*virtual*/ std::string LLDir_Mac::getLLPluginFilename(std::string base_name) |
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index aa74502..c9a2f7b 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py | |||
| @@ -784,7 +784,7 @@ class DarwinManifest(ViewerManifest): | |||
| 784 | # ) | 784 | # ) |
| 785 | 785 | ||
| 786 | # plugin launcher | 786 | # plugin launcher |
| 787 | self.path("../llplugin/slplugin/" + self.args['configuration'] + "/SLPlugin", "SLPlugin") | 787 | self.path("../llplugin/slplugin/" + self.args['configuration'] + "/SLPlugin.app", "SLPlugin.app") |
| 788 | 788 | ||
| 789 | # plugins | 789 | # plugins |
| 790 | if self.prefix(src="", dst="llplugin"): | 790 | if self.prefix(src="", dst="llplugin"): |