Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated doc/contributions.txt and added various missing patches from imprudence.

Browse Source 
This updates the source tree with patches that I committed to
imprudence up till and including 2010-10-19.
This commit is contained in:
Aleric Inglewood
2011-05-04 15:52:25 +02:00
parent 6848c2df6f
commit ccaa494e85
10 changed files with 36 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
doc/contributions.txt
View File

@@ -4,6 +4,10 @@ along with the issue identifier corresponding to the patches we've
received from them. To see more about these contributions, visit the
browsable version: http://wiki.secondlife.com/wiki/Source_contributions
Entries are related to URLs as follows:
IMP-xxx: http://redmine.kokuaviewer.org/issues/xxx
Everything else ([VWR|SNOW|CT|SVC|WEB]-xxx): https://jira.secondlife.com/browse/KEY-xxx
Able Whitman
VWR-650
VWR-1460
@@ -60,7 +64,9 @@ Alejandro Rosenthal
Aleric Inglewood
VWR-10759
VWR-10837
VWR-12838 (IMP-552)
VWR-12984
VWR-13040 (IMP-575)
VWR-13996
VWR-14426
VWR-14914
@@ -72,18 +78,28 @@ Aleric Inglewood
SNOW-129
SNOW-196
SNOW-203
SNOW-240
SNOW-408
SNOW-415
SNOW-415 (IMP-576)
SNOW-477 (IMP-577)
SNOW-479
SNOW-626
SNOW-713
SNOW-744
SNOW-751
SNOW-744 (IMP-578)
SNOW-752
SNOW-753
SNOW-766 (IMP-553)
SNOW-772
SNOW-793
SNOW-796 (IMP-581)
SNOW-800 (IMP-556)
SNOW-806
IMP-429
IMP-561
IMP-565
IMP-566
IMP-567
IMP-573
Alissa Sabre
VWR-81
VWR-83
@@ -105,7 +121,7 @@ Alissa Sabre
VWR-1351
VWR-1353
VWR-1410
VWR-1843
VWR-1843
VWR-2116
VWR-2826
VWR-3290
@@ -113,17 +129,17 @@ Alissa Sabre
VWR-3857
VWR-4010
VWR-5575
VWR-5929
VWR-6384
VWR-6385
VWR-5929
VWR-6384
VWR-6385
VWR-6386
VWR-6430
VWR-6430
VWR-6858
VWR-6668
VWR-7086
VWR-7087
VWR-7153
VWR-7168
VWR-6668
VWR-7086
VWR-7087
VWR-7153
VWR-7168
VWR-9190
VWR-10728
VWR-12620
@@ -181,6 +197,7 @@ Boroondas Gupte
SNOW-201
SNOW-396
SNOW-589
SNOW-623 (IMP-554)
SNOW-624
VWR-233
WEB-262
@@ -549,7 +566,7 @@ Pf Shan
CT-321
princess niven
VWR-5733
CT-85
CT-85
CT-320
CT-352
Renault Clio
@@ -590,6 +607,7 @@ Robin Cornelius
VWR-11128
VWR-12758
VWR-12686
VWR-12838
Ryozu Kojima
VWR-53
VWR-287
@@ -788,4 +806,3 @@ Zi Ree
Zipherius Turas
VWR-76
VWR-77

1
indra/cmake/CMakeLists.txt
View File

@@ -35,7 +35,6 @@ set(cmake_SOURCE_FILES
FindNDOF.cmake
FindOpenJPEG.cmake
FindXmlRpcEpi.cmake
FindMyZLIB.cmake
FMOD.cmake
FreeType.cmake
GStreamer010Plugin.cmake

46
indra/cmake/FindMyZLIB.cmake
View File

@@ -1,46 +0,0 @@
# -*- cmake -*-
# - Find zlib
# Find the ZLIB includes and library
# This module defines
# ZLIB_INCLUDE_DIRS, where to find zlib.h, etc.
# ZLIB_LIBRARIES, the libraries needed to use zlib.
# ZLIB_FOUND, If false, do not try to use zlib.
#
# This FindZLIB is about 43 times as fast the one provided with cmake (2.8.x),
# because it doesn't look up the version of zlib, resulting in a dramatic
# speed up for configure (from 4 minutes 22 seconds to 6 seconds).
#
# Note: Since this file is only used for standalone, the windows
# specific parts were left out.
FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
NO_SYSTEM_ENVIRONMENT_PATH
)
FIND_LIBRARY(ZLIB_LIBRARY z)
if (ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
SET(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR})
SET(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
SET(ZLIB_FOUND "YES")
else (ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
SET(ZLIB_FOUND "NO")
endif (ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
if (ZLIB_FOUND)
if (NOT ZLIB_FIND_QUIETLY)
message(STATUS "Found ZLIB: ${ZLIB_LIBRARIES}")
SET(ZLIB_FIND_QUIETLY TRUE)
endif (NOT ZLIB_FIND_QUIETLY)
else (ZLIB_FOUND)
if (ZLIB_FIND_REQUIRED)
message(FATAL_ERROR "Could not find ZLIB library")
endif (ZLIB_FIND_REQUIRED)
endif (ZLIB_FOUND)
mark_as_advanced(
ZLIB_LIBRARY
ZLIB_INCLUDE_DIR
)

1
indra/cmake/UI.cmake
View File

@@ -42,6 +42,7 @@ else (STANDALONE)
gdk_pixbuf-2.0
Xinerama
glib-2.0
gio-2.0
gmodule-2.0
gobject-2.0
gthread-2.0

2
indra/cmake/ZLIB.cmake
View File

@@ -6,7 +6,7 @@ set(ZLIB_FIND_REQUIRED ON)
include(Prebuilt)
if (STANDALONE)
include(FindMyZLIB)
include(FindZLIB)
else (STANDALONE)
use_prebuilt_binary(zlib)
if (WINDOWS)

10
indra/newview/llappviewer.cpp
View File

@@ -1120,16 +1120,6 @@ bool LLAppViewer::mainLoop()
bool LLAppViewer::cleanup()
{
//----------------------------------------------
//this test code will be removed after the test
//test manual call stack tracer
if(gSavedSettings.getBOOL("QAMode"))
{
LLError::LLCallStacks::print() ;
}
//end of the test code
//----------------------------------------------
//flag all elements as needing to be destroyed immediately
// to ensure shutdown order
LLMortician::setZealous(TRUE);

2
indra/newview/llfloaterabout.cpp
View File

@@ -275,7 +275,7 @@ LLFloaterAbout::LLFloaterAbout()
// TODO: Implement media plugin version query
support.append("Qt Webkit Version: 4.7.1 ");
support.append("Qt Webkit Version: 4.7.1 (version number hard-coded)");
support.append("\n");
if (gPacketsIn > 0)

2
indra/newview/llselectmgr.h
View File

@@ -252,7 +252,7 @@ public:
return (object != NULL) && node->mValid && !node->mIndividualSelection && (object->isRootEdit() || object->isJointChild());
}
};
typedef boost::filter_iterator<is_root, list_t::iterator > valid_root_iterator;
typedef boost::filter_iterator<is_valid_root, list_t::iterator > valid_root_iterator;
valid_root_iterator valid_root_begin() { return valid_root_iterator(mList.begin(), mList.end()); }
valid_root_iterator valid_root_end() { return valid_root_iterator(mList.end(), mList.end()); }

17
indra/newview/viewer_manifest.py
View File

@@ -827,25 +827,8 @@ class Linux_x86_64Manifest(LinuxManifest):
self.path("libopenal.so.1")
self.path("libalut.so.0")
# GTK+ and dependencies
## Lets just use the system libraries for all of these:
##self.path("libatk-1.0.so.0")
##self.path("libcairo.so.2")
##self.path("libfontconfig.so.1")
##self.path("libfreetype.so.6")
self.path("libgdk_pixbuf-2.0.so.0") # was commented to use systems gdk pixbufs instead -
# but seems webkit needs it o_O . Packaging for testing now.
##self.path("libgdk-x11-2.0.so.0")
##self.path("libgtk-x11-2.0.so.0")
# self.path("libpango-1.0.so.0") # use systems pango instead
# self.path("libpangoft2-1.0.so.0") # Both gdk pixbufs and pango would load systems modules
# 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")
self.end_prefix("lib64")
# Vivox runtimes and libs
if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
self.path("SLVoice")

114
install.xml
View File

@@ -374,39 +374,6 @@
</map>
</map>
</map>
<key>fmod</key>
<map>
<key>copyright</key>
<string>FMOD Sound System, copyright (C) Firelight Technologies Pty, Ltd., 1994-2006.</string>
<key>description</key>
<string>Audio engine and mp3 stream decoder .</string>
<key>license</key>
<string>fmod</string>
<key>packages</key>
<map>
<key>darwin</key>
<map>
<key>md5sum</key>
<string>c7e317bec481b7efa2a0319e163dcc65</string>
<key>url</key>
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/fmod-3.75-darwin-20080818.tar.bz2</uri>
</map>
<key>linux</key>
<map>
<key>md5sum</key>
<string>abd2b4ba4ac993f19d82804af387eb7c</string>
<key>url</key>
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/fmod-3.75-linux-20080818.tar.bz2</uri>
</map>
<key>windows</key>
<map>
<key>md5sum</key>
<string>1a55dec2907821f5f785648a660126c3</string>
<key>url</key>
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/fmod-3.75-windows-20080611.tar.bz2</uri>
</map>
</map>
</map>
<key>fontconfig</key>
<map>
<key>license</key>
@@ -1015,35 +982,6 @@ anguage Infrstructure (CLI) international standard</string>
</map>
</map>
</map>
<key>mysql</key>
<map>
<key>license</key>
<string>gpl</string>
<key>packages</key>
<map>
<key>darwin</key>
<map>
<key>md5sum</key>
<string>df27f2db244ea2762759a06cd75ada4e</string>
<key>url</key>
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/mysql-darwin-20080812.tar.bz2</uri>
</map>
<key>linux</key>
<map>
<key>md5sum</key>
<string>cc86b4cc858655e23704d1168325d7b9</string>
<key>url</key>
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/mysqlclient-linux-20090320.tar.bz2</uri>
</map>
<key>windows</key>
<map>
<key>md5sum</key>
<string>98bac06680dca907e783d8dd4aa9edde</string>
<key>url</key>
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/mysql-windows-20080804.tar.bz2</uri>
</map>
</map>
</map>
<key>ndofdev</key>
<map>
<key>copyright</key>
@@ -1219,58 +1157,6 @@ anguage Infrstructure (CLI) international standard</string>
</map>
</map>
</map>
<key>quicktime</key>
<map>
<key>copyright</key>
<string>Copyright (C) 1990-2007 by Apple Computer, Inc., all rights reserved.</string>
<key>description</key>
<string>Separate download. Used to play in-world video clips on a prim. </string>
<key>license</key>
<string>quicktime</string>
<key>packages</key>
<map>
<key>windows</key>
<map>
<key>md5sum</key>
<string>be45825cc14ede53790ac93c58307dcb</string>
<key>url</key>
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/quicktime-sdk-windows-7.3-20091110.tar.bz2</uri>
</map>
</map>
</map>
<key>smartheap</key>
<map>
<key>copyright</key>
<string>Copyright (C) 1991-2000 Compuware Corporation. All Rights Reserved.</string>
<key>description</key>
<string>Memory Management Library</string>
<key>license</key>
<string>smartheap</string>
<key>packages</key>
<map>
<key>darwin</key>
<map>
<key>md5sum</key>
<string>f54131b5f228e805c64c2e4e6c96579a</string>
<key>url</key>
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/smartheap-6.0.2-darwin-20080610.tar.bz2</uri>
</map>
<key>linux</key>
<map>
<key>md5sum</key>
<string>499208522bf7d7843e1d014d64214e06</string>
<key>url</key>
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/smartheap-6.0.2-linux-20080610.tar.bz2</uri>
</map>
<key>windows</key>
<map>
<key>md5sum</key>
<string>78fd47017f21d11eae43bca3e38a3e1e</string>
<key>url</key>
<uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/smartheap-6.0.2-windows-20080611.tar.bz2</uri>
</map>
</map>
</map>
<key>tut</key>
<map>
<key>copyright</key>