From 52f397ec7a0f0698ea24c05c1bd538ec17161714 Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Thu, 18 Nov 2010 17:28:13 -0500
Subject: SH-350 SH-351 SH-355 FIX ARC fixes
Had a few debugging lines in my last checkin.
Cleaning up unreviewed changes.
---
indra/cmake/APR.cmake | 2 +-
indra/cmake/Copy3rdPartyLibs.cmake | 3 ++-
indra/cmake/ViewerMiscLibs.cmake | 1 +
indra/newview/llselectmgr.cpp | 1 -
install.xml | 19 +++++++++++++++++++
5 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index b6f1e06edd..180504d286 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -56,7 +56,7 @@ else (STANDALONE)
if (LINUX)
if (VIEWER)
- list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES})
+ list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} uuid)
endif (VIEWER)
list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} rt)
endif (LINUX)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 798cf9af14..93cdf3422c 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -241,7 +241,8 @@ elseif(LINUX)
libstacktrace.so
libtcmalloc_minimal.so
libtcmalloc_minimal.so.0
- libssl.so.0.9.7
+ libuuid.so.1
+ libssl.so.0.9.7
)
if (FMOD)
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index 5710360de2..32c4bc81df 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -2,6 +2,7 @@
include(Prebuilt)
if (NOT STANDALONE)
+ use_prebuilt_binary(libuuid)
use_prebuilt_binary(vivox)
use_prebuilt_binary(fontconfig)
endif(NOT STANDALONE)
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index eb1ca66334..305b629cf7 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -6353,7 +6353,6 @@ S32 LLObjectSelection::getSelectedObjectRenderCost()
{
// add the cost of each individual texture in the linkset
cost += iter->second;
- llinfos << "adding texture cost of: " << iter->second << llendl;
}
textures.clear();
}
diff --git a/install.xml b/install.xml
index fc374f8c96..ad3e9a92a2 100644
--- a/install.xml
+++ b/install.xml
@@ -1004,6 +1004,25 @@ anguage Infrstructure (CLI) international standard</string>
</map>
</map>
</map>
+ <key>libuuid</key>
+ <map>
+ <key>copyright</key>
+ <string>Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/></string>
+ <key>description</key>
+ <string>Generates UUIDs under Linux. Originally a part of the ext2fs filesystem. Also see lluuid.cpp for all platforms. Part of the e2fsprogs package.</string>
+ <key>license</key>
+ <string>lgpl</string>
+ <key>packages</key>
+ <map>
+ <key>linux</key>
+ <map>
+ <key>md5sum</key>
+ <string>91b194aed4b38bc23493b198009a8c6a</string>
+ <key>url</key>
+ <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libuuid-linux-20090417.tar.bz2</uri>
+ </map>
+ </map>
+ </map>
<key>libxml</key>
<map>
<key>license</key>
--
cgit v1.2.3