aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/cmake/00-Common.cmake12
-rw-r--r--linden/indra/cmake/GStreamer010Plugin.cmake23
-rw-r--r--linden/indra/cmake/Variables.cmake26
-rw-r--r--linden/indra/cmake/ViewerMiscLibs.cmake6
-rw-r--r--linden/indra/cmake/WebKitLibPlugin.cmake7
-rw-r--r--linden/indra/cmake/ZLIB.cmake6
-rwxr-xr-xlinden/indra/develop.py20
-rw-r--r--linden/indra/llui/llctrlselectioninterface.cpp4
-rw-r--r--linden/indra/llui/llctrlselectioninterface.h4
-rw-r--r--linden/indra/llxml/llxmlnode.cpp5
-rw-r--r--linden/indra/llxml/llxmlnode.h2
-rwxr-xr-xlinden/indra/media_plugins/webkit/media_plugin_webkit.cpp3
-rw-r--r--linden/indra/newview/llfloaterabout.cpp5
-rw-r--r--linden/indra/newview/llfloaterregioninfo.cpp11
-rw-r--r--linden/indra/newview/llvoiceclient.cpp19
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py107
-rwxr-xr-xlinden/install.xml97
-rwxr-xr-xlinden/scripts/install.py7
18 files changed, 179 insertions, 185 deletions
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 897112e..1177fc2 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -204,7 +204,8 @@ if (LINUX)
204 # This rather needs to be done elsewhere 204 # This rather needs to be done elsewhere
205 # anyway these are the flags for the 64bit releases: 205 # anyway these are the flags for the 64bit releases:
206 add_definitions(-DLINUX64=1 -pipe) 206 add_definitions(-DLINUX64=1 -pipe)
207 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers") 207 # with -ffast-math lloctree crashes teleporting to mega regions, and it didn't do much for us anyway
208 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers")
208 endif (${ARCH} STREQUAL "x86_64") 209 endif (${ARCH} STREQUAL "x86_64")
209 set(CMAKE_CXX_FLAGS_RELEASESSE2 "${CMAKE_CXX_FLAGS_RELEASESSE2} -mfpmath=sse2 -msse2") 210 set(CMAKE_CXX_FLAGS_RELEASESSE2 "${CMAKE_CXX_FLAGS_RELEASESSE2} -mfpmath=sse2 -msse2")
210 endif (VIEWER) 211 endif (VIEWER)
@@ -246,6 +247,15 @@ if (LINUX OR DARWIN)
246 247
247 set(CMAKE_C_FLAGS "${GCC_WARNINGS} ${CMAKE_C_FLAGS}") 248 set(CMAKE_C_FLAGS "${GCC_WARNINGS} ${CMAKE_C_FLAGS}")
248 set(CMAKE_CXX_FLAGS "${GCC_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}") 249 set(CMAKE_CXX_FLAGS "${GCC_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}")
250
251 if (WORD_SIZE EQUAL 32)
252 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
253 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
254 elseif (WORD_SIZE EQUAL 64)
255 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
256 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
257 endif (WORD_SIZE EQUAL 32)
258
249endif (LINUX OR DARWIN) 259endif (LINUX OR DARWIN)
250 260
251 261
diff --git a/linden/indra/cmake/GStreamer010Plugin.cmake b/linden/indra/cmake/GStreamer010Plugin.cmake
index 9d2c553..d05cb9c 100644
--- a/linden/indra/cmake/GStreamer010Plugin.cmake
+++ b/linden/indra/cmake/GStreamer010Plugin.cmake
@@ -21,13 +21,22 @@ else (STANDALONE)
21 ${LIBS_PREBUILT_DIR}/include/libxml2 21 ${LIBS_PREBUILT_DIR}/include/libxml2
22 ) 22 )
23 else (WINDOWS) 23 else (WINDOWS)
24 use_prebuilt_binary(glib) # gstreamer needs glib 24 use_prebuilt_binary(glib) # gstreamer needs glib
25 use_prebuilt_binary(libxml) 25 if (DARWIN)
26 set(GSTREAMER010_INCLUDE_DIRS 26
27 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10 27 use_prebuilt_binary(libxml)
28 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0 28 set(GSTREAMER010_INCLUDE_DIRS
29 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2 29 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10
30 ) 30 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
31 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
32 )
33 else (DARWIN)
34 add_definitions(-DGST_DISABLE_XML -DGST_DISABLE_LOADSAVE)
35 set(GSTREAMER010_INCLUDE_DIRS
36 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10
37 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
38 )
39 endif (DARWIN)
31 endif (WINDOWS) 40 endif (WINDOWS)
32 41
33endif (STANDALONE) 42endif (STANDALONE)
diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake
index 65fe841..88c0c5c 100644
--- a/linden/indra/cmake/Variables.cmake
+++ b/linden/indra/cmake/Variables.cmake
@@ -51,8 +51,30 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
51 51
52if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") 52if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
53 set(LINUX ON BOOl FORCE) 53 set(LINUX ON BOOl FORCE)
54 execute_process(COMMAND uname -m COMMAND sed s/i.86/i686/ 54
55 OUTPUT_VARIABLE ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) 55 # If someone has specified a word size, use that to determine the
56 # architecture. Otherwise, let the architecture specify the word size.
57
58 if ("$ENV{WORD_SIZE}" MATCHES "32")
59 set(WORD_SIZE 32)
60 elseif ("$ENV{WORD_SIZE}" MATCHES "64")
61 set(WORD_SIZE 64)
62 endif ()
63
64 if (WORD_SIZE EQUAL 32)
65 set(ARCH i686)
66 elseif (WORD_SIZE EQUAL 64)
67 set(ARCH x86_64)
68 else (WORD_SIZE EQUAL 32)
69 execute_process(COMMAND uname -m COMMAND sed s/i.86/i686/
70 OUTPUT_VARIABLE ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
71 if (ARCH STREQUAL x86_64)
72 set(WORD_SIZE 64)
73 else (ARCH STREQUAL x86_64)
74 set(WORD_SIZE 32)
75 endif (ARCH STREQUAL x86_64)
76 endif (WORD_SIZE EQUAL 32)
77
56 set(LL_ARCH ${ARCH}_linux) 78 set(LL_ARCH ${ARCH}_linux)
57 set(LL_ARCH_DIR ${ARCH}-linux) 79 set(LL_ARCH_DIR ${ARCH}-linux)
58endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") 80endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake
index 38d0444..bf33490 100644
--- a/linden/indra/cmake/ViewerMiscLibs.cmake
+++ b/linden/indra/cmake/ViewerMiscLibs.cmake
@@ -5,18 +5,12 @@ if (NOT STANDALONE)
5 use_prebuilt_binary(libuuid) 5 use_prebuilt_binary(libuuid)
6 use_prebuilt_binary(vivox) 6 use_prebuilt_binary(vivox)
7 if(LINUX) 7 if(LINUX)
8 if (${ARCH} STREQUAL "x86_64")
9 use_prebuilt_binary(32bitcompatibilitylibs)
10 endif (${ARCH} STREQUAL "x86_64")
11 use_prebuilt_binary(fontconfig) 8 use_prebuilt_binary(fontconfig)
12 endif(LINUX) 9 endif(LINUX)
13else (NOT STANDALONE) 10else (NOT STANDALONE)
14 # Download there even when using standalone. 11 # Download there even when using standalone.
15 set(STANDALONE OFF) 12 set(STANDALONE OFF)
16 use_prebuilt_binary(vivox) 13 use_prebuilt_binary(vivox)
17 if(LINUX AND ${ARCH} STREQUAL "x86_64")
18 use_prebuilt_binary(32bitcompatibilitylibs)
19 endif(LINUX AND ${ARCH} STREQUAL "x86_64")
20 set(STANDALONE ON) 14 set(STANDALONE ON)
21endif(NOT STANDALONE) 15endif(NOT STANDALONE)
22 16
diff --git a/linden/indra/cmake/WebKitLibPlugin.cmake b/linden/indra/cmake/WebKitLibPlugin.cmake
index a4befa4..034eed5 100644
--- a/linden/indra/cmake/WebKitLibPlugin.cmake
+++ b/linden/indra/cmake/WebKitLibPlugin.cmake
@@ -29,6 +29,9 @@ if (STANDALONE)
29 set(WEBKITLIBPLUGIN OFF CACHE BOOL 29 set(WEBKITLIBPLUGIN OFF CACHE BOOL
30 "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.") 30 "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
31else (STANDALONE) 31else (STANDALONE)
32 if(LINUX)
33 use_prebuilt_binary(kokua-qt)
34 endif(LINUX)
32 use_prebuilt_binary(llqtwebkit) 35 use_prebuilt_binary(llqtwebkit)
33 set(WEBKITLIBPLUGIN ON CACHE BOOL 36 set(WEBKITLIBPLUGIN ON CACHE BOOL
34 "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.") 37 "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
@@ -62,8 +65,6 @@ elseif (LINUX)
62 else (STANDALONE) 65 else (STANDALONE)
63 set(WEBKIT_PLUGIN_LIBRARIES 66 set(WEBKIT_PLUGIN_LIBRARIES
64 llqtwebkit 67 llqtwebkit
65 qgif
66 qjpeg
67 QtWebKit 68 QtWebKit
68 QtOpenGL 69 QtOpenGL
69 QtNetwork 70 QtNetwork
@@ -74,6 +75,8 @@ elseif (LINUX)
74 X11 75 X11
75 Xrender 76 Xrender
76 GL 77 GL
78 jscore
77 ) 79 )
80
78 endif (STANDALONE) 81 endif (STANDALONE)
79endif (WINDOWS) 82endif (WINDOWS)
diff --git a/linden/indra/cmake/ZLIB.cmake b/linden/indra/cmake/ZLIB.cmake
index 48e5130..8a16a0e 100644
--- a/linden/indra/cmake/ZLIB.cmake
+++ b/linden/indra/cmake/ZLIB.cmake
@@ -17,6 +17,10 @@ else (STANDALONE)
17 set(ZLIB_LIBRARIES z) 17 set(ZLIB_LIBRARIES z)
18 endif (WINDOWS) 18 endif (WINDOWS)
19 if (WINDOWS OR LINUX) 19 if (WINDOWS OR LINUX)
20 set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib) 20 if(LINUX AND ${ARCH} STREQUAL "x86_64")
21 set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
22 else(LINUX AND ${ARCH} STREQUAL "x86_64")
23 set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib)
24 endif(LINUX AND ${ARCH} STREQUAL "x86_64")
21 endif (WINDOWS OR LINUX) 25 endif (WINDOWS OR LINUX)
22endif (STANDALONE) 26endif (STANDALONE)
diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index b72f1d3..ffe8e61 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -223,14 +223,26 @@ class UnixSetup(PlatformSetup):
223 223
224 def arch(self): 224 def arch(self):
225 cpu = os.uname()[-1] 225 cpu = os.uname()[-1]
226 word_size = os.environ.get('WORD_SIZE')
226 if cpu.endswith('386'): 227 if cpu.endswith('386'):
227 cpu = 'i386' 228 cpu = 'i386'
229 if word_size == '64':
230 cpu = 'x86_64'
228 elif cpu.endswith('86'): 231 elif cpu.endswith('86'):
229 cpu = 'i686' 232 if word_size == '64':
233 cpu = 'x86_64'
234 else:
235 cpu = 'i686'
230 elif cpu in ('x86_64'): 236 elif cpu in ('x86_64'):
231 cpu = 'x86_64' 237 if word_size == '32':
232 elif cpu in ('athlon',): 238 cpu = 'i686'
233 cpu = 'i686' 239 else:
240 cpu = 'x86_64'
241 elif cpu in ('athlon',):
242 if word_size == '64':
243 cpu = 'x86_64'
244 else:
245 cpu = 'i686'
234 elif cpu == 'Power Macintosh': 246 elif cpu == 'Power Macintosh':
235 cpu = 'ppc' 247 cpu = 'ppc'
236 return cpu 248 return cpu
diff --git a/linden/indra/llui/llctrlselectioninterface.cpp b/linden/indra/llui/llctrlselectioninterface.cpp
index dac0939..1111b9d 100644
--- a/linden/indra/llui/llctrlselectioninterface.cpp
+++ b/linden/indra/llui/llctrlselectioninterface.cpp
@@ -39,12 +39,12 @@
39LLCtrlSelectionInterface::~LLCtrlSelectionInterface() 39LLCtrlSelectionInterface::~LLCtrlSelectionInterface()
40{ } 40{ }
41 41
42BOOL LLCtrlSelectionInterface::selectByValue(LLSD value) 42BOOL LLCtrlSelectionInterface::selectByValue(const LLSD& value)
43{ 43{
44 return setSelectedByValue(value, TRUE); 44 return setSelectedByValue(value, TRUE);
45} 45}
46 46
47BOOL LLCtrlSelectionInterface::deselectByValue(LLSD value) 47BOOL LLCtrlSelectionInterface::deselectByValue(const LLSD& value)
48{ 48{
49 return setSelectedByValue(value, FALSE); 49 return setSelectedByValue(value, FALSE);
50} 50}
diff --git a/linden/indra/llui/llctrlselectioninterface.h b/linden/indra/llui/llctrlselectioninterface.h
index 45727d6..7b5cd66 100644
--- a/linden/indra/llui/llctrlselectioninterface.h
+++ b/linden/indra/llui/llctrlselectioninterface.h
@@ -67,8 +67,8 @@ public:
67 virtual BOOL setCurrentByID( const LLUUID& id ) = 0; 67 virtual BOOL setCurrentByID( const LLUUID& id ) = 0;
68 virtual LLUUID getCurrentID() const = 0; 68 virtual LLUUID getCurrentID() const = 0;
69 69
70 BOOL selectByValue(const LLSD value); 70 BOOL selectByValue(const LLSD& value);
71 BOOL deselectByValue(const LLSD value); 71 BOOL deselectByValue(const LLSD& value);
72 virtual BOOL setSelectedByValue(const LLSD& value, BOOL selected) = 0; 72 virtual BOOL setSelectedByValue(const LLSD& value, BOOL selected) = 0;
73 virtual LLSD getSelectedValue() = 0; 73 virtual LLSD getSelectedValue() = 0;
74 74
diff --git a/linden/indra/llxml/llxmlnode.cpp b/linden/indra/llxml/llxmlnode.cpp
index 5bb5012..0e2f9a2 100644
--- a/linden/indra/llxml/llxmlnode.cpp
+++ b/linden/indra/llxml/llxmlnode.cpp
@@ -499,10 +499,7 @@ void XMLCALL StartXMLNode(void *userData,
499 pos += 2; 499 pos += 2;
500 } 500 }
501 501
502 if (parent) 502 parent->addChild(new_node);
503 {
504 parent->addChild(new_node);
505 }
506} 503}
507 504
508void XMLCALL EndXMLNode(void *userData, 505void XMLCALL EndXMLNode(void *userData,
diff --git a/linden/indra/llxml/llxmlnode.h b/linden/indra/llxml/llxmlnode.h
index ab1a772..d71a221 100644
--- a/linden/indra/llxml/llxmlnode.h
+++ b/linden/indra/llxml/llxmlnode.h
@@ -245,7 +245,7 @@ public:
245 void setFloatValue(const F32 value, Encoding encoding = ENCODING_DEFAULT, U32 precision = 0) { setFloatValue(1, &value, encoding); } 245 void setFloatValue(const F32 value, Encoding encoding = ENCODING_DEFAULT, U32 precision = 0) { setFloatValue(1, &value, encoding); }
246 void setDoubleValue(const F64 value, Encoding encoding = ENCODING_DEFAULT, U32 precision = 0) { setDoubleValue(1, &value, encoding); } 246 void setDoubleValue(const F64 value, Encoding encoding = ENCODING_DEFAULT, U32 precision = 0) { setDoubleValue(1, &value, encoding); }
247 void setStringValue(const std::string& value) { setStringValue(1, &value); } 247 void setStringValue(const std::string& value) { setStringValue(1, &value); }
248 void setUUIDValue(const LLUUID value) { setUUIDValue(1, &value); } 248 void setUUIDValue(const LLUUID& value) { setUUIDValue(1, &value); }
249 void setNodeRefValue(const LLXMLNode *value) { setNodeRefValue(1, &value); } 249 void setNodeRefValue(const LLXMLNode *value) { setNodeRefValue(1, &value); }
250 250
251 void setBoolValue(U32 length, const BOOL *array); 251 void setBoolValue(U32 length, const BOOL *array);
diff --git a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
index 4a00557..2cae8d2 100755
--- a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -81,6 +81,7 @@ extern "C" {
81#ifdef LL_STANDALONE 81#ifdef LL_STANDALONE
82#include <qglobal.h> 82#include <qglobal.h>
83#elif defined(LL_LINUX) 83#elif defined(LL_LINUX)
84
84// We don't provide Qt headers for non-standalone, therefore define this here. 85// We don't provide Qt headers for non-standalone, therefore define this here.
85// Our prebuilt is built with QT_NAMESPACE undefined. 86// Our prebuilt is built with QT_NAMESPACE undefined.
86#define QT_MANGLE_NAMESPACE(name) name 87#define QT_MANGLE_NAMESPACE(name) name
@@ -1156,7 +1157,9 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
1156 std::string url = message_in.getValue("url"); 1157 std::string url = message_in.getValue("url");
1157 if ( 404 == code ) // browser lib only supports 404 right now 1158 if ( 404 == code ) // browser lib only supports 404 right now
1158 { 1159 {
1160#if LLQTWEBKIT_API_VERSION < 8
1159 LLQtWebKit::getInstance()->set404RedirectUrl( mBrowserWindowId, url ); 1161 LLQtWebKit::getInstance()->set404RedirectUrl( mBrowserWindowId, url );
1162#endif
1160 }; 1163 };
1161 } 1164 }
1162 else if(message_name == "set_user_agent") 1165 else if(message_name == "set_user_agent")
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()
261 support.append("\n"); 261 support.append("\n");
262 262
263 // TODO: Implement media plugin version query 263 // TODO: Implement media plugin version query
264 264#if LL_LINUX
265 support.append("Qt Webkit Version: 4.7.4 (version number hard-coded)");
266#else
265 support.append("Qt Webkit Version: 4.6 (version number hard-coded)"); 267 support.append("Qt Webkit Version: 4.6 (version number hard-coded)");
268#endif
266 support.append("\n"); 269 support.append("\n");
267 270
268 if (gPacketsIn > 0) 271 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)
1726//--------------------------------------------------------------------------- 1726//---------------------------------------------------------------------------
1727// Kick from estate methods 1727// Kick from estate methods
1728//--------------------------------------------------------------------------- 1728//---------------------------------------------------------------------------
1729struct LLKickFromEstateInfo 1729
1730{
1731 LLPanelEstateInfo *mEstatePanelp;
1732 LLUUID mAgentID;
1733};
1734 1730
1735void LLPanelEstateInfo::onClickKickUser(void *user_data) 1731void LLPanelEstateInfo::onClickKickUser(void *user_data)
1736{ 1732{
@@ -1757,10 +1753,7 @@ void LLPanelEstateInfo::onKickUserCommit(const std::vector<std::string>& names,
1757 LLPanelEstateInfo* self = (LLPanelEstateInfo*)userdata; 1753 LLPanelEstateInfo* self = (LLPanelEstateInfo*)userdata;
1758 if(!self) return; 1754 if(!self) return;
1759 1755
1760 //keep track of what user they want to kick and other misc info 1756
1761 LLKickFromEstateInfo *kick_info = new LLKickFromEstateInfo();
1762 kick_info->mEstatePanelp = self;
1763 kick_info->mAgentID = ids[0];
1764 1757
1765 //Bring up a confirmation dialog 1758 //Bring up a confirmation dialog
1766 LLSD args; 1759 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()
1212 // ms_sleep(2000); 1212 // ms_sleep(2000);
1213 gVoiceClient->connectorShutdown(); 1213 gVoiceClient->connectorShutdown();
1214 gVoiceClient->closeSocket(); // Need to do this now -- bad things happen if the destructor does it later. 1214 gVoiceClient->closeSocket(); // Need to do this now -- bad things happen if the destructor does it later.
1215 1215
1216 // This will do unpleasant things on windows. 1216 LL_DEBUGS("IdleCallbacks") << "IdleCallbacks deleteFunction "
1217// killGateway(); 1217 << "called from LLVoiceClient" << LL_ENDL;
1218 1218 gIdleCallbacks.deleteFunction(idle, gVoiceClient);
1219
1220 if (isGatewayRunning())
1221 {
1222 // This will do unpleasant things on windows.
1223 // AW: no unpleasant things observed on windows,
1224 // guess they came from sloppy cleanup.
1225 killGateway();
1226 }
1227
1219 // Don't do this anymore -- LLSingleton will take care of deleting the object. 1228 // Don't do this anymore -- LLSingleton will take care of deleting the object.
1220// delete gVoiceClient; 1229// delete gVoiceClient;
1221 1230
1222 // Hint to other code not to access the voice client anymore. 1231 // Hint to other code not to access the voice client anymore.
1223 gVoiceClient = NULL; 1232 gVoiceClient = NULL;
1224 } 1233 }
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):
948 self.path("libSDL-1.2.so.0") 948 self.path("libSDL-1.2.so.0")
949 self.path("libELFIO.so") 949 self.path("libELFIO.so")
950 self.path("libopenjpeg.so.2") 950 self.path("libopenjpeg.so.2")
951 self.path("libxml2.so.2")
952 self.path("libz.so") 951 self.path("libz.so")
953 self.path("libz.so.1") 952 self.path("libz.so.1")
954 953
955 # OpenAL 954 # OpenAL
956 self.path("libopenal.so.1.12.854", "libopenal.so.1") 955 self.path("libalut.so")
957 self.path("libalut.so.0.1.0", "libalut.so.0") 956 self.path("libalut.so.0")
957 self.path("libalut.so.0.0.0")
958 self.path("libopenal.so")
959 self.path("libopenal.so.1")
960 self.path("libopenal.so.1.13.0")
958 961
959 # GTK+ and dependencies 962 # GTK+ and dependencies
960 ## Lets just use the system libraries for all of these: 963 ## Lets just use the system libraries for all of these:
@@ -1047,7 +1050,6 @@ class Linux_i686Manifest(LinuxManifest):
1047 self.end_prefix("bin") 1050 self.end_prefix("bin")
1048 1051
1049 if self.prefix(src="vivox-runtime/i686-linux", dst="lib"): 1052 if self.prefix(src="vivox-runtime/i686-linux", dst="lib"):
1050 self.path("libalut.so")
1051 self.path("libortp.so") 1053 self.path("libortp.so")
1052 self.path("libvivoxsdk.so") 1054 self.path("libvivoxsdk.so")
1053 self.end_prefix("lib") 1055 self.end_prefix("lib")
@@ -1076,22 +1078,37 @@ class Linux_x86_64Manifest(LinuxManifest):
1076 self.path("libapr-1.so.0") 1078 self.path("libapr-1.so.0")
1077 self.path("libaprutil-1.so.0") 1079 self.path("libaprutil-1.so.0")
1078 self.path("libdb-4.2.so") 1080 self.path("libdb-4.2.so")
1079 self.path("libcrypto.so.0.9.8") 1081 self.path("libcrypto.so")
1082 self.path("libcrypto.so.1.0.0")
1080 self.path("libexpat.so.1") 1083 self.path("libexpat.so.1")
1081 self.path("libhunspell-1.2.so.0.0.0", "libhunspell-1.2.so.0") 1084 self.path("libhunspell-1.2.so.0.0.0", "libhunspell-1.2.so.0")
1082 self.path("libssl.so.0.9.8") 1085 self.path("libssl.so")
1086 self.path("libssl.so.1.0.0")
1083 self.path("libuuid.so", "libuuid.so.1") 1087 self.path("libuuid.so", "libuuid.so.1")
1084 self.path("libSDL-1.2.so.0") 1088 self.path("libSDL-1.2.so.0")
1085 self.path("libELFIO.so") 1089 self.path("libELFIO.so")
1086 self.path("libjpeg.so.7") 1090 self.path("libjpeg.so.7")
1087 self.path("libpng12.so.0") 1091 self.path("libpng12.so.0")
1088 self.path("libopenjpeg.so.2") 1092 self.path("libopenjpeg.so.2")
1089 self.path("libxml2.so.2")
1090 #self.path("libz.so.1") #not needed
1091 1093
1094 self.path("libcares.so")
1095 self.path("libcares.so.2")
1096 self.path("libcares.so.2.0.0")
1097 self.path("libcurl.so")
1098 self.path("libcurl.so.4")
1099 self.path("libcurl.so.4.2.0")
1100 self.path("libz.so.1.2.5")
1101 self.path("libz.so.1")
1102 self.path("libz.so")
1092 # OpenAL 1103 # OpenAL
1093 self.path("libopenal.so.1.12.854", "libopenal.so.1") 1104
1094 self.path("libalut.so.0.1.0", "libalut.so.0") 1105 self.path("libopenal.so")
1106 self.path("libopenal.so.1")
1107 self.path("libopenal.so.1.13.0")
1108 self.path("libalut.so")
1109 self.path("libalut.so.0")
1110 self.path("libalut.so.0.0.0")
1111
1095 # GTK+ and dependencies 1112 # GTK+ and dependencies
1096 ## Lets just use the system libraries for all of these: 1113 ## Lets just use the system libraries for all of these:
1097 ##self.path("libatk-1.0.so.0") 1114 ##self.path("libatk-1.0.so.0")
@@ -1106,69 +1123,6 @@ class Linux_x86_64Manifest(LinuxManifest):
1106# self.path("libpangox-1.0.so.0") # and crash if not compatible or present. 1123# self.path("libpangox-1.0.so.0") # and crash if not compatible or present.
1107# self.path("libpangoxft-1.0.so.0") # So we depend system gdk pixbufs and pango anyway. 1124# self.path("libpangoxft-1.0.so.0") # So we depend system gdk pixbufs and pango anyway.
1108 ##self.path("libpixman-1.so.0") 1125 ##self.path("libpixman-1.so.0")
1109
1110#KILL IT WITH FIRE
1111 ## Gstreamer libs
1112 #self.path("libgstbase-0.10.so.0")
1113 #self.path("libgstreamer-0.10.so.0")
1114 #self.path("libgstaudio-0.10.so.0")
1115 #self.path("libgstbase-0.10.so.0")
1116 #self.path("libgstcontroller-0.10.so.0")
1117 #self.path("libgstdataprotocol-0.10.so.0")
1118 #self.path("libgstinterfaces-0.10.so.0")
1119 #self.path("libgstnetbuffer-0.10.so.0")
1120 #self.path("libgstpbutils-0.10.so.0")
1121 #self.path("libgstriff-0.10.so.0")
1122 #self.path("libgstrtp-0.10.so.0")
1123 #self.path("libgstrtsp-0.10.so.0")
1124 #self.path("libgstsdp-0.10.so.0")
1125 #self.path("libgsttag-0.10.so.0")
1126 #self.path("libgstvideo-0.10.so.0")
1127
1128 ## Gstreamer plugin dependencies
1129 #self.path("libfaad.so.0")
1130 #self.path("libogg.so.0")
1131 #self.path("libtheora.so.0")
1132 #self.path("libvorbis.so.0")
1133 #self.path("libvorbisenc.so.2")
1134 #self.path("liboil-0.3.so.0")
1135
1136 ## Gstreamer plugins
1137 #if self.prefix("gstreamer-plugins"):
1138 #self.path("libgstalsa.so")
1139 #self.path("libgstasf.so")
1140 #self.path("libgstaudioconvert.so")
1141 #self.path("libgstaudioresample.so")
1142 #self.path("libgstautodetect.so")
1143 #self.path("libgstavi.so")
1144 #self.path("libgstcoreelements.so")
1145 #self.path("libgstcoreindexers.so")
1146 #self.path("libgstdecodebin2.so")
1147 #self.path("libgstdecodebin.so")
1148 #self.path("libgstesd.so")
1149 #self.path("libgstfaad.so")
1150 #self.path("libgstffmpeg.so")
1151 #self.path("libgstffmpegcolorspace.so")
1152 #self.path("libgstgnomevfs.so")
1153 #self.path("libgsticydemux.so")
1154 #self.path("libgstid3demux.so")
1155 #self.path("libgstmpegdemux.so")
1156 #self.path("libgstmultifile.so")
1157 #self.path("libgstmultipart.so")
1158 #self.path("libgstogg.so")
1159 #self.path("libgstossaudio.so")
1160 #self.path("libgstplaybin.so")
1161 #self.path("libgstpulse.so")
1162 #self.path("libgstqtdemux.so")
1163 #self.path("libgstqueue2.so")
1164 #self.path("libgsttcp.so")
1165 #self.path("libgsttheora.so")
1166 #self.path("libgsttypefindfunctions.so")
1167 #self.path("libgstudp.so")
1168 #self.path("libgstvideoscale.so")
1169 #self.path("libgstvolume.so")
1170 #self.path("libgstvorbis.so")
1171 #self.path("libgstwavparse.so")
1172 1126
1173 #self.end_prefix("gstreamer-plugins") 1127 #self.end_prefix("gstreamer-plugins")
1174# [$PLOTR$] these two are not needed when STATIC_LIBOTR_ETC is on in .../linden/indra/CMakeLists.txt 1128# [$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):
1176# self.path("libotr.so.2") 1130# self.path("libotr.so.2")
1177# [/$PLOTR$] 1131# [/$PLOTR$]
1178 self.end_prefix("lib64") 1132 self.end_prefix("lib64")
1179 1133
1180 1134
1181 # Vivox runtimes and libs 1135 # Vivox runtimes and libs
1182 if self.prefix(src="vivox-runtime/i686-linux", dst="bin"): 1136 if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
@@ -1192,9 +1146,12 @@ class Linux_x86_64Manifest(LinuxManifest):
1192 # 32bit libs needed for voice 1146 # 32bit libs needed for voice
1193 if self.prefix("../../libraries/x86_64-linux/lib_release_client/32bit-compat", dst="lib32"): 1147 if self.prefix("../../libraries/x86_64-linux/lib_release_client/32bit-compat", dst="lib32"):
1194 self.path("libalut.so") 1148 self.path("libalut.so")
1149 self.path("libalut.so.0")
1150 self.path("libalut.so.0.0.0")
1195 self.path("libidn.so.11") 1151 self.path("libidn.so.11")
1152 self.path("libopenal.so")
1196 self.path("libopenal.so.1") 1153 self.path("libopenal.so.1")
1197 # self.path("libortp.so") 1154 self.path("libopenal.so.1.13.0")
1198 self.path("libuuid.so.1") 1155 self.path("libuuid.so.1")
1199 self.end_prefix("lib32") 1156 self.end_prefix("lib32")
1200 1157
diff --git a/linden/install.xml b/linden/install.xml
index 24c201b..3e5810a 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -153,9 +153,9 @@
153 <key>linux64</key> 153 <key>linux64</key>
154 <map> 154 <map>
155 <key>md5sum</key> 155 <key>md5sum</key>
156 <string>c4242416e0b2e642c0bf062a19a250e4</string> 156 <string>301a1317c7d5bebbdc396e1a4874175b</string>
157 <key>url</key> 157 <key>url</key>
158 <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.3.0-linux64-20080909.tar.bz2</uri> 158 <uri>http://download.kokuaviewer.org/files/libs/ares-1.7.1-Linux-x86_64-20110405.tar.bz2</uri>
159 </map> 159 </map>
160 <key>windows</key> 160 <key>windows</key>
161 <map> 161 <map>
@@ -242,9 +242,9 @@
242 <key>linux64</key> 242 <key>linux64</key>
243 <map> 243 <map>
244 <key>md5sum</key> 244 <key>md5sum</key>
245 <string>6e9242d11d785f643f34d925a29967e7</string> 245 <string>7e698e37a1425d66f709163a36ce0b5a</string>
246 <key>url</key> 246 <key>url</key>
247 <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.16.4-linux64-20080909.tar.bz2</uri> 247 <uri>http://download.kokuaviewer.org/files/libs/curl-7.21.4-Linux-x86_64-20110405.tar.bz2</uri>
248 </map> 248 </map>
249 <key>windows</key> 249 <key>windows</key>
250 <map> 250 <map>
@@ -397,9 +397,9 @@
397 <key>linux64</key> 397 <key>linux64</key>
398 <map> 398 <map>
399 <key>md5sum</key> 399 <key>md5sum</key>
400 <string>13b551e5deafbaa6cfd105fa072bdfba</string> 400 <string>d7242641aa40019af06214b1d2a10bec</string>
401 <key>url</key> 401 <key>url</key>
402 <uri>http://imprudenceviewer.org/download/libs/fontconfig-2.7.3-linux64-20091230.tar.bz2</uri> 402 <uri>http://download.kokuaviewer.org/files/test-builds/fontconfig-2.7.3-Linux-x86_64-20110805.tar.bz2</uri>
403 </map> 403 </map>
404 </map> 404 </map>
405 </map> 405 </map>
@@ -523,9 +523,9 @@
523 <key>linux64</key> 523 <key>linux64</key>
524 <map> 524 <map>
525 <key>md5sum</key> 525 <key>md5sum</key>
526 <string>58c11add6b275c163950364df5b2964a</string> 526 <string>f181d42b6f7b2e9ca68174dbf3d282a5</string>
527 <key>url</key> 527 <key>url</key>
528 <uri>http://imprudenceviewer.org/download/libs/glib-2.20.5-linux64-20100515.tar.bz2</uri> 528 <uri>http://download.kokuaviewer.org/files/test-builds/glib-2.24.2-Linux-x86_64-20110806.tar.bz2</uri>
529 </map> 529 </map>
530 </map> 530 </map>
531 </map> 531 </map>
@@ -655,9 +655,9 @@ cairo: Copyright © 2002 University of Southern California, Copyright © 2005 Re
655 <key>linux64</key> 655 <key>linux64</key>
656 <map> 656 <map>
657 <key>md5sum</key> 657 <key>md5sum</key>
658 <string>e8cb3f28379b7730004da44f04263936</string> 658 <string>e373ea5a705ec84de48c0dd9306d3dd5</string>
659 <key>url</key> 659 <key>url</key>
660 <uri>http://imprudenceviewer.org/download/libs/gtk-etc-linux64-20091231.tar.bz2</uri> 660 <uri>http://download.kokuaviewer.org/files/test-builds/gtk-etc-Linux-x86_64-20110806.tar.bz2</uri>
661 </map> 661 </map>
662 </map> 662 </map>
663 </map> 663 </map>
@@ -937,26 +937,34 @@ Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
937 <key>url</key> 937 <key>url</key>
938 <uri>http://imprudenceviewer.org/download/libs/libxml-2.6.27-darwin-20091107.tar.bz2</uri> 938 <uri>http://imprudenceviewer.org/download/libs/libxml-2.6.27-darwin-20091107.tar.bz2</uri>
939 </map> 939 </map>
940 </map>
941 </map>
942 <key>kokua-qt</key>
943 <map>
944 <key>license</key>
945 <string>lgpl</string>
946 <key>packages</key>
947 <map>
940 <key>linux</key> 948 <key>linux</key>
941 <map> 949 <map>
942 <key>md5sum</key> 950 <key>md5sum</key>
943 <string>922f4bc6a8091d07a988b983cafe7a5a</string> 951 <string>380775ee42191982c22fa5f5f5428250</string>
944 <key>url</key> 952 <key>url</key>
945 <uri>http://imprudenceviewer.org/download/libs/libxml2-2.7.4-r1-linux-20091115.tar.bz2</uri> 953 <uri>http://download.kokuaviewer.org/files/libs/kokua-qt4.7.4-Linux-i686-20110620.tar.bz2</uri>
946 </map> 954 </map>
947 <key>linux64</key> 955 <key>linux64</key>
948 <map> 956 <map>
949 <key>md5sum</key> 957 <key>md5sum</key>
950 <string>631df56daeac6aaf5be4c1e39dba6859</string> 958 <string>4c6c0f607f7cc9ebaa5446fd9ca3371a</string>
951 <key>url</key> 959 <key>url</key>
952 <uri>http://imprudenceviewer.org/download/libs/libxml2-2.7.4-r1-linux64-20091230.tar.bz2</uri> 960 <uri>http://download.kokuaviewer.org/files/libs/kokua-qt4.7.4-Linux-x86_64-20110620.tar.bz2</uri>
953 </map> 961 </map>
954 </map> 962 </map>
955 </map> 963 </map>
956 <key>llqtwebkit</key> 964 <key>llqtwebkit</key>
957 <map> 965 <map>
958 <key>license</key> 966 <key>license</key>
959 <string>lgpl</string> 967 <string>gpl</string>
960 <key>packages</key> 968 <key>packages</key>
961 <map> 969 <map>
962 <key>darwin</key> 970 <key>darwin</key>
@@ -969,16 +977,16 @@ Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
969 <key>linux</key> 977 <key>linux</key>
970 <map> 978 <map>
971 <key>md5sum</key> 979 <key>md5sum</key>
972 <string>5d743c93b970abe685b185de83001a6e</string> 980 <string>d2f69c0d72e28037f5377538d4ec8dfe</string>
973 <key>url</key> 981 <key>url</key>
974 <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-qt4.6-20100923.tar.bz2</uri> 982 <uri>http://download.kokuaviewer.org/files/libs/kokua-llqtwebkit-Linux-i686-20110620.tar.bz2</uri>
975 </map> 983 </map>
976 <key>linux64</key> 984 <key>linux64</key>
977 <map> 985 <map>
978 <key>md5sum</key> 986 <key>md5sum</key>
979 <string>d5deaf897fe8effa3d3537c875060379</string> 987 <string>28fe808f318a2b66146e4bbcf1f96306</string>
980 <key>url</key> 988 <key>url</key>
981 <uri>http://imprudenceviewer.org/download/libs/llqtwebkit-linux64-20100907.tar.bz2</uri> 989 <uri>http://download.kokuaviewer.org/files/libs/kokua-llqtwebkit-Linux-x86_64-20110620.tar.bz2</uri>
982 </map> 990 </map>
983 <key>windows</key> 991 <key>windows</key>
984 <map> 992 <map>
@@ -1146,29 +1154,19 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
1146 <key>url</key> 1154 <key>url</key>
1147 <uri>http://imprudenceviewer.org/download/libs/openal-darwin-20091118.tar.bz2</uri> 1155 <uri>http://imprudenceviewer.org/download/libs/openal-darwin-20091118.tar.bz2</uri>
1148 </map> 1156 </map>
1149<!-- openal compiled against pulse 0.9.10
1150 <key>linux</key>
1151 <map>
1152 <key>md5sum</key>
1153 <string>9dfdc055297355d04e04b905f92fbfad</string>
1154 <key>url</key>
1155 <uri>http://imprudenceviewer.org/download/libs/openal-linux32-20100426.tar.bz2</uri>
1156 </map>
1157-->
1158 <!-- openal compiled against pulse 0.9.21 -->
1159 <key>linux</key> 1157 <key>linux</key>
1160 <map> 1158 <map>
1161 <key>md5sum</key> 1159 <key>md5sum</key>
1162 <string>44f9bacc69a3d29ae0b46ed69ad7c2ce</string> 1160 <string>cb1acfef8c0c44e86b539bae0e255a2e</string>
1163 <key>url</key> 1161 <key>url</key>
1164 <uri>http://download.kokuaviewer.org/files/libs/openal-linux32-20110304.tar.bz2</uri> 1162 <uri>http://download.kokuaviewer.org/files/libs/openal-1.13-Linux-i686-20110708.tar.bz2</uri>
1165 </map> 1163 </map>
1166 <key>linux64</key> 1164 <key>linux64</key>
1167 <map> 1165 <map>
1168 <key>md5sum</key> 1166 <key>md5sum</key>
1169 <string>032848c2591a15e26c71998df3644cfc</string> 1167 <string>7b1039886ab997d2926604540426961f</string>
1170 <key>url</key> 1168 <key>url</key>
1171 <uri>http://download.kokuaviewer.org/files/libs/openal-linux64-pulse0.9.21-20110304.tar.bz2</uri> 1169 <uri>http://download.kokuaviewer.org/files/libs/openal-1.13-Linux-x86_64-20110708.tar.bz2</uri>
1172 </map> 1170 </map>
1173 <key>windows</key> 1171 <key>windows</key>
1174 <map> 1172 <map>
@@ -1209,9 +1207,9 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
1209 <key>linux64</key> 1207 <key>linux64</key>
1210 <map> 1208 <map>
1211 <key>md5sum</key> 1209 <key>md5sum</key>
1212 <string>00b23f28a2457d9dabbaff0b29ee7323</string> 1210 <string>d02fd5e08e7300e418ac86f00a321b23</string>
1213 <key>url</key> 1211 <key>url</key>
1214 <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8g-linux64-20080909.tar.bz2</uri> 1212 <uri>http://download.kokuaviewer.org/files/libs/openSSL-1.0.0-Linux-x86_64-20110405.tar.bz2</uri>
1215 </map> 1213 </map>
1216 <key>windows</key> 1214 <key>windows</key>
1217 <map> 1215 <map>
@@ -1449,29 +1447,6 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
1449 </map> 1447 </map>
1450 </map> 1448 </map>
1451 </map> 1449 </map>
1452 <key>32bitcompatibilitylibs</key>
1453 <map>
1454 <key>copyright</key>
1455 <string>Copyrights: Libidn: Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
1456 Simon Josefsson. License GPL v3.0.
1457 Freealut, libuuid, openal-soft: see copyright and license of the
1458 according main packages.
1459 </string>
1460 <key>description</key>
1461 <string>32bit libraries needed for using voice</string>
1462 <key>license</key>
1463 <string>gpl</string>
1464 <key>packages</key>
1465 <map>
1466 <key>linux64</key>
1467 <map>
1468 <key>md5sum</key>
1469 <string>cbaafc55fb8b14283541791e82f13462</string>
1470 <key>url</key>
1471 <uri>http://imprudenceviewer.org/download/libs/linux64-32bitcompatibilitylibs-20100903.tar.bz2</uri>
1472 </map>
1473 </map>
1474 </map>
1475 <key>xmlrpc-epi</key> 1450 <key>xmlrpc-epi</key>
1476 <map> 1451 <map>
1477 <key>copyright</key> 1452 <key>copyright</key>
@@ -1539,9 +1514,9 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
1539 <key>linux64</key> 1514 <key>linux64</key>
1540 <map> 1515 <map>
1541 <key>md5sum</key> 1516 <key>md5sum</key>
1542 <string>d085a173e3c05ff3bb0ee36ba42deb2c</string> 1517 <string>36716acbb29ed2adbc8d82d9ddbdec65</string>
1543 <key>url</key> 1518 <key>url</key>
1544 <uri>http://imprudenceviewer.org/download/libs/zlib-1.2.3-linux64-lenny-20091202.tar.bz2</uri> 1519 <uri>http://download.kokuaviewer.org/files/libs/z-lib-1.2.5-Linux-x86_64-20110405.tar.bz2</uri>
1545 </map> 1520 </map>
1546 <key>windows</key> 1521 <key>windows</key>
1547 <map> 1522 <map>
diff --git a/linden/scripts/install.py b/linden/scripts/install.py
index f09fc48..c69644b 100755
--- a/linden/scripts/install.py
+++ b/linden/scripts/install.py
@@ -805,11 +805,14 @@ def _get_platform():
805 } 805 }
806 this_platform = platform_map[sys.platform] 806 this_platform = platform_map[sys.platform]
807 if this_platform == 'linux': 807 if this_platform == 'linux':
808 if platform.architecture()[0] == '64bit': 808 word_size = os.environ.get('WORD_SIZE')
809 if platform.architecture()[0] == '64bit' or word_size == '64':
809 # TODO -- someday when install.py accepts a platform of the form 810 # TODO -- someday when install.py accepts a platform of the form
810 # os/arch/compiler/compiler_version then we can replace the 811 # os/arch/compiler/compiler_version then we can replace the
811 # 'linux64' platform with 'linux/x86_64/gcc/4.1' 812 # 'linux64' platform with 'linux/x86_64/gcc/4.1'
812 this_platform = 'linux64' 813 if not word_size == '32':
814 this_platform = 'linux64'
815
813 return this_platform 816 return this_platform
814 817
815def _getuser(): 818def _getuser():
generated by cgit v1.1 at 2025-02-04 21:49:28 +0000