From 67f55bad571044535f1d8c3b3c3afb5078249fd3 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Fri, 15 Oct 2010 17:49:06 +0200
Subject: RED-595: Manual merge with weekly-webkit.
Plus some white space fixes (TABs --> spaces) in install.xml.
---
linden/indra/newview/linux_tools/wrapper.sh | 13 +++----
linden/indra/newview/llfloaterhtmlhelp.cpp | 2 +-
linden/indra/newview/llmediactrl.cpp | 3 +-
linden/indra/newview/llstartup.cpp | 4 --
linden/indra/newview/secondlife-i686.supp | 44 ----------------------
.../newview/skins/default/xui/zh/mime_types.xml | 9 -----
linden/indra/newview/viewer_manifest.py | 6 +--
7 files changed, 10 insertions(+), 71 deletions(-)
(limited to 'linden/indra/newview')
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index 8c47434..a43ebd5 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -106,17 +106,16 @@ if [ -n "$LL_TCMALLOC" ]; then
fi
fi
fi
-BINARY_SYSTEM=$(expr match "$(file -b /bin/uname)" '\(.*executable\)')
-BINARY_VIEWER=$(expr match "$(file -b ${RUN_PATH}/bin/do-not-directly-run-imprudence-bin)" '\(.*executable\)')
-echo "viewer: $BINARY_VIEWER system: $BINARY_SYSTEM"
-if ( [ "$BINARY_SYSTEM" == "ELF 64-bit LSB executable" ] && [ "$BINARY_VIEWER" == "ELF 64-bit LSB executable" ] ); then
- export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib64:"`pwd`"/lib32:"`pwd`"/app_settings/mozilla-runtime-linux-x86_64:"${LD_LIBRARY_PATH}"'
+export VIEWER_BINARY='do-not-directly-run-imprudence-bin'
+BINARY_TYPE=$(expr match "$(file -b bin/$VIEWER_BINARY)" '\(.*executable\)')
+if [ "${BINARY_TYPE}" == "ELF 64-bit LSB executable" ]; then
+ export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib64:"`pwd`"/lib32:"${LD_LIBRARY_PATH}"'
else
- export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}"'
+ export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"${LD_LIBRARY_PATH}"'
fi
-export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-imprudence-bin'
+export SL_CMD='$LL_WRAPPER bin/$VIEWER_BINARY'
export SL_OPT="`cat gridargs.dat` $@"
# Run the program
diff --git a/linden/indra/newview/llfloaterhtmlhelp.cpp b/linden/indra/newview/llfloaterhtmlhelp.cpp
index 1777403..1ec964b 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.cpp
+++ b/linden/indra/newview/llfloaterhtmlhelp.cpp
@@ -534,7 +534,7 @@ void LLFloaterHtmlHelp::onStatusTextChange( const EventType& eventIn )
//
void LLFloaterHtmlHelp::onLocationChange( const EventType& eventIn )
{
- llinfos << "MOZ> Location changed to " << eventIn.getStringValue() << llendl;
+ llinfos << "WEB> Location changed to " << eventIn.getStringValue() << llendl;
mCurrentUrl = std::string( eventIn.getStringValue() );
}
diff --git a/linden/indra/newview/llmediactrl.cpp b/linden/indra/newview/llmediactrl.cpp
index 1530598..c3bcf85 100644
--- a/linden/indra/newview/llmediactrl.cpp
+++ b/linden/indra/newview/llmediactrl.cpp
@@ -199,8 +199,9 @@ BOOL LLMediaCtrl::handleMouseUp( S32 x, S32 y, MASK mask )
{
mMediaSource->mouseUp(x, y);
- // *HACK: LLMediaImplLLMozLib automatically takes focus on mouseup,
+ // *HACK: media_plugin_webkit automatically takes focus on mouseup,
// in addition to the onFocusReceived() call below. Undo this. JC
+ // RED-595: Is this really still the case for webkit?
if (!mTakeFocusOnClick)
{
mMediaSource->focus(false);
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index bd22772..7bd5fff 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -199,10 +199,6 @@
#include <Security/Security.h>
#endif
-#if LL_LIBXUL_ENABLED
-#include "llmozlib.h"
-#endif // LL_LIBXUL_ENABLED
-
#if LL_WINDOWS
#include "llwindebug.h"
#include "lldxhardware.h"
diff --git a/linden/indra/newview/secondlife-i686.supp b/linden/indra/newview/secondlife-i686.supp
index 43d4483..d70cda3 100644
--- a/linden/indra/newview/secondlife-i686.supp
+++ b/linden/indra/newview/secondlife-i686.supp
@@ -41,50 +41,6 @@
# - After you build the viewer, replace the stripped
# do-not-directly-run-secondlife-bin binary with an unstripped copy.
-# Mozilla noise.
-
-{
- Cond:mozilla-runtime/*.so
- Memcheck:Cond
- obj:*/mozilla-runtime-*/*.so
-}
-
-{
- Value4:mozilla-runtime/*.so
- Memcheck:Value4
- obj:*/mozilla-runtime-*/*.so
-}
-
-{
- Cond:mozilla-runtime/*/*.so
- Memcheck:Cond
- obj:*/mozilla-runtime-*/*/*.so
-}
-
-{
- Value4:mozilla-runtime/*/*.so
- Memcheck:Value4
- obj:*/mozilla-runtime-*/*/*.so
-}
-
-{
- Cond:mozilla-runtime/libmozjs.so
- Memcheck:Cond
- obj:*/libmozjs.so
-}
-
-{
- Cond:mozilla-runtime/libxul
- Memcheck:Cond
- obj:*/libxul.so
-}
-
-{
- Value4:mozilla-runtime/libxul
- Memcheck:Value4
- obj:*/libxul.so
-}
-
# libcurl badness.
{
diff --git a/linden/indra/newview/skins/default/xui/zh/mime_types.xml b/linden/indra/newview/skins/default/xui/zh/mime_types.xml
index fc5fae4..0cc6f2f 100644
--- a/linden/indra/newview/skins/default/xui/zh/mime_types.xml
+++ b/linden/indra/newview/skins/default/xui/zh/mime_types.xml
@@ -1,14 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<mimetypes name="default">
- <defaultlabel>
- (未知)
- </defaultlabel>
- <defaultwidget>
- 无
- </defaultwidget>
- <defaultimpl>
- LLMediaImplLLMozLib
- </defaultimpl>
<widgetset name="web">
<label name="web_label">
网页内容
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 314cb65..143d946 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -949,7 +949,6 @@ class Linux_i686Manifest(LinuxManifest):
super(Linux_i686Manifest, self).construct()
self.path("imprudence-stripped","bin/do-not-directly-run-imprudence-bin")
-
if (not self.standalone()) and self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"):
self.path("libapr-1.so.0")
self.path("libaprutil-1.so.0")
@@ -1076,9 +1075,6 @@ class Linux_x86_64Manifest(LinuxManifest):
self.path("featuretable_linux.txt")
#self.path("secondlife-x86_64.supp")
- if not self.standalone():
- self.path("app_settings/mozilla-runtime-linux-x86_64")
-
if (not self.standalone()) and self.prefix("../../libraries/x86_64-linux/lib_release_client", dst="lib64"):
self.path("libapr-1.so.0")
self.path("libaprutil-1.so.0")
@@ -1090,7 +1086,7 @@ class Linux_x86_64Manifest(LinuxManifest):
self.path("libuuid.so", "libuuid.so.1")
self.path("libSDL-1.2.so.0")
self.path("libELFIO.so")
- self.path("libjpeg.so.7")
+ self.path("libjpeg.so.62")
self.path("libpng12.so.0")
self.path("libopenjpeg.so.2")
self.path("libxml2.so.2")
--
cgit v1.1