IMP-692: SNOW-713: Fixed compile bug fixes.

Changes:
* Added changes from snowglobe 1.5 to indra/llcommon/llstring.h
  (compile errors as a result of a missing include, but I copied
  everything else too).
* Added #include "linden_common.h" to emeraldboobutils.cpp.
  Really it's one the header files that needed that, but that's
  how this header works: every source file should include it as
  first header anyway, then there is no need for other headers
  to do that.
* Renamed LLPanelRegionOpenSettingsInfo::sendUpdate(void*) to
  LLPanelRegionOpenSettingsInfo::onClickOrs because it was
  hiding a virtual function (BOOL sendUpdate(void)).
* Made cutToClipboard more equal to copyToClipboard (was also
  hiding a virtual function).
* Install libllcommon.so in lib64 on Linux_x86_64, instead of lib.

1 files changed, 6 insertions, 4 deletions

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index a93e058..f631d1f 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -228,7 +228,7 @@ class WindowsManifest(ViewerManifest):
             self.path("LICENSE-libraries.txt")
             self.end_prefix("../..")
 
-                
+
         self.path("imprudence.url")
 
         # Plugin host application
@@ -741,7 +741,7 @@ class DarwinManifest(ViewerManifest):
                 #self.path("vivox-runtime/universal-darwin/SLVoiceAgent.app", "SLVoiceAgent.app")
 
                 libdir = "../../libraries/universal-darwin/lib_release"
-                                dylibs = {}
+                dylibs = {}
 
                 #for lib in "llkdu", "llcommon":
                 for lib in "llcommon":
@@ -940,8 +940,6 @@ class LinuxManifest(ViewerManifest):
         # Per platform MIME config on the cheap.  See SNOW-307 / DEV-41388
         self.path("skins/default/xui/en-us/mime_types_linux.xml", "skins/default/xui/en-us/mime_types.xml")
 
-        self.path("../llcommon/libllcommon.so", "lib/libllcommon.so")
-
         self.path("featuretable_linux.txt")
 
 
@@ -997,6 +995,8 @@ class Linux_i686Manifest(LinuxManifest):
         super(Linux_i686Manifest, self).construct()
         self.path("imprudence-stripped","bin/do-not-directly-run-imprudence-bin")
 
+        self.path("../llcommon/libllcommon.so", "lib/libllcommon.so")
+
         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")
@@ -1114,6 +1114,8 @@ class Linux_x86_64Manifest(LinuxManifest):
         self.path("imprudence-stripped","bin/do-not-directly-run-imprudence-bin")
 #        self.path("../linux_crash_logger/linux-crash-logger-stripped","linux-crash-logger.bin")
 
+        self.path("../llcommon/libllcommon.so", "lib64/libllcommon.so")
+
         self.path("linux_tools/launch_url.sh","launch_url.sh")
         if self.prefix("res-sdl"):
             self.path("*")