From ecec32deaff66550dd79b16104353ffee9a9039c Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 13 Nov 2010 23:13:21 -0600
Subject: Fixed path to Mac SLPlugin launcher.

---
 linden/indra/llvfs/lldir_mac.cpp        | 2 +-
 linden/indra/newview/viewer_manifest.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'linden/indra')

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
 /*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)
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):
                 #                     )
 
                 # plugin launcher
-                self.path("../llplugin/slplugin/" + self.args['configuration'] + "/SLPlugin", "SLPlugin")
+                self.path("../llplugin/slplugin/" + self.args['configuration'] + "/SLPlugin.app", "SLPlugin.app")
 
                 # plugins
                 if self.prefix(src="", dst="llplugin"):
-- 
cgit v1.1