Merge branch 'next' of git://github.com/ArminW/imprudence into next

Conflicts:
	linden/indra/newview/viewer_manifest.py
Conflicted with the OTR stuff, simple fix.

4 files changed, 52 insertions, 90 deletions

diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 13795e5..06bee7d 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -261,8 +261,11 @@ LLFloaterAbout::LLFloaterAbout()
         support.append("\n");
 
         // TODO: Implement media plugin version query
-
+#if LL_LINUX
+        support.append("Qt Webkit Version: 4.7.4 (version number hard-coded)");
+#else
         support.append("Qt Webkit Version: 4.6 (version number hard-coded)");
+#endif
         support.append("\n");
 
         if (gPacketsIn > 0)
diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp
index 8810a5c..08bda48 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -1726,11 +1726,7 @@ void LLPanelEstateInfo::onClickRemoveEstateManager(void* user_data)
 //---------------------------------------------------------------------------
 // Kick from estate methods
 //---------------------------------------------------------------------------
-struct LLKickFromEstateInfo
-{
-        LLPanelEstateInfo *mEstatePanelp;
-        LLUUID      mAgentID;
-};
+
 
 void LLPanelEstateInfo::onClickKickUser(void *user_data)
 {
@@ -1757,10 +1753,7 @@ void LLPanelEstateInfo::onKickUserCommit(const std::vector<std::string>& names,
         LLPanelEstateInfo* self = (LLPanelEstateInfo*)userdata;
         if(!self) return;
 
-        //keep track of what user they want to kick and other misc info
-        LLKickFromEstateInfo *kick_info = new LLKickFromEstateInfo();
-        kick_info->mEstatePanelp = self;
-        kick_info->mAgentID     = ids[0];
+
 
         //Bring up a confirmation dialog
         LLSD args;
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index c5b5e99..4a5fb48 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -1212,13 +1212,22 @@ void LLVoiceClient::terminate()
                 // ms_sleep(2000);
                 gVoiceClient->connectorShutdown();
                 gVoiceClient->closeSocket();            // Need to do this now -- bad things happen if the destructor does it later.
-                
-                // This will do unpleasant things on windows.
-//              killGateway();
-                
+
+                LL_DEBUGS("IdleCallbacks") << "IdleCallbacks deleteFunction " 
+                                        << "called from LLVoiceClient" << LL_ENDL;
+                gIdleCallbacks.deleteFunction(idle, gVoiceClient);
+
+                if (isGatewayRunning())
+                {
+                        // This will do unpleasant things on windows.
+                        // AW: no unpleasant things observed on windows,
+                        // guess they came from sloppy cleanup.
+                        killGateway();
+                }
+
                 // Don't do this anymore -- LLSingleton will take care of deleting the object.          
 //              delete gVoiceClient;
-                
+
                 // Hint to other code not to access the voice client anymore.
                 gVoiceClient = NULL;
         }
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index cb226fe..e350af0 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -948,13 +948,16 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libSDL-1.2.so.0")
             self.path("libELFIO.so")
             self.path("libopenjpeg.so.2")
-            self.path("libxml2.so.2")
             self.path("libz.so")
             self.path("libz.so.1")
 
             # OpenAL
-            self.path("libopenal.so.1.12.854", "libopenal.so.1")
-            self.path("libalut.so.0.1.0", "libalut.so.0")
+            self.path("libalut.so")
+            self.path("libalut.so.0")
+            self.path("libalut.so.0.0.0")
+            self.path("libopenal.so")
+            self.path("libopenal.so.1")
+            self.path("libopenal.so.1.13.0")
 
             # GTK+ and dependencies
             ## Lets just use the system libraries for all of these:
@@ -1047,7 +1050,6 @@ class Linux_i686Manifest(LinuxManifest):
                 self.end_prefix("bin")
 
             if self.prefix(src="vivox-runtime/i686-linux", dst="lib"):
-                self.path("libalut.so")
                 self.path("libortp.so")
                 self.path("libvivoxsdk.so")
                 self.end_prefix("lib")
@@ -1076,22 +1078,37 @@ class Linux_x86_64Manifest(LinuxManifest):
             self.path("libapr-1.so.0")
             self.path("libaprutil-1.so.0")
             self.path("libdb-4.2.so")
-            self.path("libcrypto.so.0.9.8")
+            self.path("libcrypto.so")
+            self.path("libcrypto.so.1.0.0")
             self.path("libexpat.so.1")
             self.path("libhunspell-1.2.so.0.0.0", "libhunspell-1.2.so.0")
-            self.path("libssl.so.0.9.8")
+            self.path("libssl.so")
+            self.path("libssl.so.1.0.0")
             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("libpng12.so.0")
             self.path("libopenjpeg.so.2")
-            self.path("libxml2.so.2")
-            #self.path("libz.so.1") #not needed
 
+            self.path("libcares.so")
+            self.path("libcares.so.2")
+            self.path("libcares.so.2.0.0")
+            self.path("libcurl.so")
+            self.path("libcurl.so.4")
+            self.path("libcurl.so.4.2.0")
+            self.path("libz.so.1.2.5")
+            self.path("libz.so.1")
+            self.path("libz.so")
             # OpenAL
-            self.path("libopenal.so.1.12.854", "libopenal.so.1")
-            self.path("libalut.so.0.1.0", "libalut.so.0")
+
+            self.path("libopenal.so")
+            self.path("libopenal.so.1")
+            self.path("libopenal.so.1.13.0")
+            self.path("libalut.so")
+            self.path("libalut.so.0")
+            self.path("libalut.so.0.0.0")
+
             # GTK+ and dependencies
             ## Lets just use the system libraries for all of these:
             ##self.path("libatk-1.0.so.0")
@@ -1106,69 +1123,6 @@ class Linux_x86_64Manifest(LinuxManifest):
 #            self.path("libpangox-1.0.so.0")            # and crash if not compatible or present. 
 #            self.path("libpangoxft-1.0.so.0")          # So we depend system gdk pixbufs and pango anyway.
             ##self.path("libpixman-1.so.0")
-
-#KILL IT WITH FIRE
-            ## Gstreamer libs
-            #self.path("libgstbase-0.10.so.0")
-            #self.path("libgstreamer-0.10.so.0")
-            #self.path("libgstaudio-0.10.so.0")
-            #self.path("libgstbase-0.10.so.0")
-            #self.path("libgstcontroller-0.10.so.0")
-            #self.path("libgstdataprotocol-0.10.so.0")
-            #self.path("libgstinterfaces-0.10.so.0")
-            #self.path("libgstnetbuffer-0.10.so.0")
-            #self.path("libgstpbutils-0.10.so.0")
-            #self.path("libgstriff-0.10.so.0")
-            #self.path("libgstrtp-0.10.so.0")
-            #self.path("libgstrtsp-0.10.so.0")
-            #self.path("libgstsdp-0.10.so.0")
-            #self.path("libgsttag-0.10.so.0")
-            #self.path("libgstvideo-0.10.so.0")
-
-            ## Gstreamer plugin dependencies
-            #self.path("libfaad.so.0")
-            #self.path("libogg.so.0")
-            #self.path("libtheora.so.0")
-            #self.path("libvorbis.so.0")
-            #self.path("libvorbisenc.so.2")
-            #self.path("liboil-0.3.so.0")
-
-            ## Gstreamer plugins
-            #if self.prefix("gstreamer-plugins"):
-                #self.path("libgstalsa.so")
-                #self.path("libgstasf.so")
-                #self.path("libgstaudioconvert.so")
-                #self.path("libgstaudioresample.so")
-                #self.path("libgstautodetect.so")
-                #self.path("libgstavi.so")
-                #self.path("libgstcoreelements.so")
-                #self.path("libgstcoreindexers.so")
-                #self.path("libgstdecodebin2.so")
-                #self.path("libgstdecodebin.so")
-                #self.path("libgstesd.so")
-                #self.path("libgstfaad.so")
-                #self.path("libgstffmpeg.so")
-                #self.path("libgstffmpegcolorspace.so")
-                #self.path("libgstgnomevfs.so")
-                #self.path("libgsticydemux.so")
-                #self.path("libgstid3demux.so")
-                #self.path("libgstmpegdemux.so")
-                #self.path("libgstmultifile.so")
-                #self.path("libgstmultipart.so")
-                #self.path("libgstogg.so")
-                #self.path("libgstossaudio.so")
-                #self.path("libgstplaybin.so")
-                #self.path("libgstpulse.so")
-                #self.path("libgstqtdemux.so")
-                #self.path("libgstqueue2.so")
-                #self.path("libgsttcp.so")
-                #self.path("libgsttheora.so")
-                #self.path("libgsttypefindfunctions.so")
-                #self.path("libgstudp.so")
-                #self.path("libgstvideoscale.so")
-                #self.path("libgstvolume.so")
-                #self.path("libgstvorbis.so")
-                #self.path("libgstwavparse.so")
                 
                 #self.end_prefix("gstreamer-plugins")
 # [$PLOTR$] these two are not needed when STATIC_LIBOTR_ETC is on in .../linden/indra/CMakeLists.txt
@@ -1176,7 +1130,7 @@ class Linux_x86_64Manifest(LinuxManifest):
 #            self.path("libotr.so.2")
 # [/$PLOTR$]
             self.end_prefix("lib64")
-        
+
 
             # Vivox runtimes and libs
             if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
@@ -1192,9 +1146,12 @@ class Linux_x86_64Manifest(LinuxManifest):
         # 32bit libs needed for voice
         if self.prefix("../../libraries/x86_64-linux/lib_release_client/32bit-compat", dst="lib32"):
             self.path("libalut.so")
+            self.path("libalut.so.0")
+            self.path("libalut.so.0.0.0")
             self.path("libidn.so.11")
+            self.path("libopenal.so")
             self.path("libopenal.so.1")
-            # self.path("libortp.so")
+            self.path("libopenal.so.1.13.0")
             self.path("libuuid.so.1")
             self.end_prefix("lib32")