summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
diff options
context:
space:
mode:
authorAdam Moss <moss@lindenlab.com>2009-08-31 17:16:21 +0000
committerAdam Moss <moss@lindenlab.com>2009-08-31 17:16:21 +0000
commit158946668a75a0dad7b53bc74fd2b6f8f4a4befc (patch)
treefdbd74ca881f5dd386c84496e393504c6b7eacb5 /indra/newview/viewer_manifest.py
parent6dbef5f2a41d5ee974b808b8e863d4f973dfa2c3 (diff)
svn merge -r130875:131962 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit
DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit
Diffstat (limited to 'indra/newview/viewer_manifest.py')
-rwxr-xr-xindra/newview/viewer_manifest.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index d175a26531..b743954420 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -487,10 +487,7 @@ class DarwinManifest(ViewerManifest):
self.path("../llplugin/slplugin/" + self.args['configuration'] + "/SLPlugin", "SLPlugin")
self.path("../media_plugins/quicktime/" + self.args['configuration'] + "/media_plugin_quicktime.dylib", "media_plugin_quicktime.dylib")
self.path("../media_plugins/webkit/" + self.args['configuration'] + "/media_plugin_webkit.dylib", "media_plugin_webkit.dylib")
- self.path("../../libraries/universal-darwin/lib_release/libllwebkitlib.dylib", "libllwebkitlib.dylib")
-
- self.path("../media_plugins/awesomium/" + self.args['configuration'] + "/media_plugin_awesomium.dylib", "media_plugin_awesomium.dylib")
- self.path("../../libraries/universal-darwin/lib_release/Awesomium.framework", "Awesomium.framework")
+ self.path("../../libraries/universal-darwin/lib_release/libllqtwebkit.dylib", "libllqtwebkit.dylib")
self.end_prefix("llplugin")