svn merge -r99056:99248 svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew/gcc-4-003-for-merge

8 files changed, 45 insertions, 38 deletions

diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake
index 05aefaf522..25e9f6d4f4 100644
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -19,6 +19,10 @@ if (GOOGLE_PERFTOOLS_FOUND)
   set(USE_GOOGLE_PERFTOOLS ON CACHE BOOL "Build with Google PerfTools support.")
 endif (GOOGLE_PERFTOOLS_FOUND)
 
+# XXX Disable temporarily, until we have compilation issues on 64-bit
+# Etch sorted.
+set(USE_GOOGLE_PERFTOOLS OFF)
+
 if (USE_GOOGLE_PERFTOOLS)
   set(TCMALLOC_FLAG -DLL_USE_TCMALLOC=1)
   include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR})
diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake
index a02b5d958e..f103dcf664 100644
--- a/indra/cmake/LLKDU.cmake
+++ b/indra/cmake/LLKDU.cmake
@@ -5,8 +5,6 @@ if (NOT STANDALONE AND EXISTS ${LIBS_CLOSED_DIR}/llkdu)
   use_prebuilt_binary(kdu)
   if (WINDOWS)
     set(KDU_LIBRARY debug kdu_cored optimized kdu_core)
-  elseif (LINUX)
-    set(KDU_LIBRARY kdu_v42R)
   else (WINDOWS)
     set(KDU_LIBRARY kdu)
   endif (WINDOWS)
diff --git a/indra/develop.py b/indra/develop.py
index c3b1b12652..5078820eaa 100755
--- a/indra/develop.py
+++ b/indra/develop.py
@@ -218,11 +218,15 @@ class UnixSetup(PlatformSetup):
         elif cpu == 'Power Macintosh':
             cpu = 'ppc'
         return cpu
-        
+
 
 class LinuxSetup(UnixSetup):
     def __init__(self):
         super(LinuxSetup, self).__init__()
+        try:
+            self.debian_sarge = open('/etc/debian_version').read().strip() == '3.1'
+        except:
+            self.debian_sarge = False
 
     def os(self):
         return 'linux'
@@ -234,6 +238,11 @@ class LinuxSetup(UnixSetup):
 
         if self.arch() == 'i686' and self.is_internal_tree():
             return ['viewer-' + platform_build, 'server-' + platform_build]
+        elif self.arch() == 'x86_64' and self.is_internal_tree():
+            # the viewer does not build in 64bit -- kdu5 issues
+            # we can either use openjpeg, or overhaul our viewer to handle kdu5 or higher
+            # doug knows about kdu issues
+            return ['server-' + platform_build]
         else:
             return ['viewer-' + platform_build]
 
@@ -265,18 +274,16 @@ class LinuxSetup(UnixSetup):
                 distcc = []
                 baseonly = False
             if 'server' in build_dir:
-                gcc33 = distcc + self.find_in_path('g++-3.3', 'g++', baseonly)
-                args.update({'cxx':' '.join(gcc33), 'server':'ON',
-                             'viewer':'OFF'})
+                gcc = distcc + self.find_in_path(
+                    self.debian_sarge and 'g++-3.3' or 'g++-4.1',
+                    'g++', baseonly)
+                args.update({'cxx': ' '.join(gcc), 'server': 'ON',
+                             'viewer': 'OFF'})
             else:
                 gcc41 = distcc + self.find_in_path('g++-4.1', 'g++', baseonly)
-                args.update({'cxx': ' '.join(gcc41), 'server':'OFF',
-                             'viewer':'ON'})
-        #if simple:
-        #    return (('cmake %(opts)s '
-        #             '-DSERVER:BOOL=%(server)s ' 
-        #             '-DVIEWER:BOOL=%(viewer)s '
-        #             '%(dir)r') % args)
+                args.update({'cxx': ' '.join(gcc41),
+                             'server': 'OFF',
+                             'viewer': 'ON'})
         cmd = (('cmake -DCMAKE_BUILD_TYPE:STRING=%(type)s '
                 '-G %(generator)r -DSERVER:BOOL=%(server)s '
                 '-DVIEWER:BOOL=%(viewer)s -DSTANDALONE:BOOL=%(standalone)s '
diff --git a/indra/lib/python/indra/ipc/mysql_pool.py b/indra/lib/python/indra/ipc/mysql_pool.py
index a2324cf956..9793e24a10 100644
--- a/indra/lib/python/indra/ipc/mysql_pool.py
+++ b/indra/lib/python/indra/ipc/mysql_pool.py
@@ -30,8 +30,10 @@ import MySQLdb
 from eventlet import db_pool
 
 class DatabaseConnector(db_pool.DatabaseConnector):
-    def __init__(self, credentials, min_size = 0, max_size = 4, *args, **kwargs):
-        super(DatabaseConnector, self).__init__(MySQLdb, credentials, min_size, max_size, conn_pool=db_pool.ConnectionPool, *args, **kwargs)
+    def __init__(self, credentials, *args, **kwargs):
+        super(DatabaseConnector, self).__init__(MySQLdb, credentials,
+                                                conn_pool=db_pool.ConnectionPool,
+                                                *args, **kwargs)
 
     # get is extended relative to eventlet.db_pool to accept a port argument
     def get(self, host, dbname, port=3306):
@@ -42,7 +44,7 @@ class DatabaseConnector(db_pool.DatabaseConnector):
             new_kwargs['host'] = host
             new_kwargs['port'] = port
             new_kwargs.update(self.credentials_for(host))
-            dbpool = ConnectionPool(self._min_size, self._max_size, *self._args, **new_kwargs)
+            dbpool = ConnectionPool(*self._args, **new_kwargs)
             self._databases[key] = dbpool
 
         return self._databases[key]
@@ -51,8 +53,8 @@ class ConnectionPool(db_pool.TpooledConnectionPool):
     """A pool which gives out saranwrapped MySQLdb connections from a pool
     """
 
-    def __init__(self, min_size = 0, max_size = 4, *args, **kwargs):
-        super(ConnectionPool, self).__init__(MySQLdb, min_size, max_size, *args, **kwargs)
+    def __init__(self, *args, **kwargs):
+        super(ConnectionPool, self).__init__(MySQLdb, *args, **kwargs)
 
     def get(self):
         conn = super(ConnectionPool, self).get()
@@ -77,14 +79,3 @@ class ConnectionPool(db_pool.TpooledConnectionPool):
         conn.connection_parameters = converted_kwargs
         return conn
 
-    def clear(self):
-        """ Close all connections that this pool still holds a reference to, leaving it empty."""
-        for conn in self.free_items:
-            try:
-                conn.close()
-            except:
-                pass   # even if stuff happens here, we still want to at least try to close all the other connections
-        self.free_items.clear()
-            
-    def __del__(self):
-        self.clear()
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index a3a5f40414..9f2cb8b71b 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -1161,13 +1161,6 @@ BOOL LLStringUtilBase<T>::convertToU32(const std::basic_string<T>& string, U32&
 	std::basic_istringstream<T> i_stream((std::basic_string<T>)temp);
 	if(i_stream >> v)
 	{
-		//TODO: figure out overflow reporting here
-		//if( ULONG_MAX == v )
-		//{
-		//	// Underflow or overflow
-		//	return FALSE;
-		//}
-
 		value = v;
 		return TRUE;
 	}
diff --git a/indra/llprimitive/lltree_common.h b/indra/llprimitive/lltree_common.h
index 302e9385f6..7860571ccf 100644
--- a/indra/llprimitive/lltree_common.h
+++ b/indra/llprimitive/lltree_common.h
@@ -36,6 +36,19 @@
 
 struct LLTree_gene_0 
 {
+	LLTree_gene_0()
+	:	scale(0),
+		branches(0),
+		twist(0),
+		droop(0),
+		species(0),
+		trunk_depth(0),
+		branch_thickness(0),
+		max_depth(0),
+		scale_step(0)
+	{
+	}
+
 	// 
 	//  The genome for a tree, species 0
 	// 
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 978d70c646..c250350745 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -622,8 +622,8 @@ class Linux_i686Manifest(LinuxManifest):
         if self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"):
             self.path("libkdu_v42R.so")
             self.path("libfmod-3.75.so")
-            self.path("libapr-1.so.0")
-            self.path("libaprutil-1.so.0")
+            self.path("libapr-1.so.0*")
+            self.path("libaprutil-1.so.0*")
             self.path("libdb-4.2.so")
             self.path("libcrypto.so.0.9.7")
             self.path("libexpat.so.1")
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index cb5f1d6c2c..c8b8846466 100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -112,6 +112,7 @@ target_link_libraries(test
     ${LLCOMMON_LIBRARIES}
     ${PTHREAD_LIBRARY}
     ${WINDOWS_LIBRARIES}
+    ${DL_LIBRARY}
     )
 
 if (WINDOWS)