From 106134b6950b55a8462fc3444db781104eb6bf5e Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 3 Dec 2010 03:37:37 -0500 Subject: Fix for OK notification being overlaid by Keep/Discard/Block notification --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/contributions.txt') diff --git a/doc/contributions.txt b/doc/contributions.txt index d4e459039d..f25656da9a 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -356,6 +356,7 @@ Joghert LeSabre Jonathan Yap VWR-17801 STORM-616 + STORM-523 Kage Pixel VWR-11 Ken March -- cgit v1.2.3 From 429e0caf17427b7a1d78b667c1bb1dd107379bf4 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Wed, 15 Dec 2010 17:31:18 +0100 Subject: SNOW-744: scripts/install.py --uninstall does not remove symbolic links. This fixes the problem that when some package contains symbolic links, they were never removed anymore (after an uninstall of that package). --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/contributions.txt') diff --git a/doc/contributions.txt b/doc/contributions.txt index 740c2f470c..3f080dfb6d 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -74,6 +74,7 @@ Aleric Inglewood VWR-14426 SNOW-84 SNOW-477 + SNOW-744 SNOW-766 STORM-163 Ales Beaumont -- cgit v1.2.3 From 0de05499eddd2afbd69b5f247d4cffdee448db19 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Wed, 15 Dec 2010 17:40:22 +0100 Subject: VWR-24247: develop.py configure still searches for the wrong header file when checking for Tut The viewer code includes "tut/tut.hpp" everywhere, so that is what we should search for when determining an include path for this header. This just searches in the usual places, including the paths provided through CMAKE_INCLUDE_PATH, and will find tut/tut.hpp: exactly what we need. --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/contributions.txt') diff --git a/doc/contributions.txt b/doc/contributions.txt index 3f080dfb6d..511ed0db9f 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -72,6 +72,7 @@ Aleric Inglewood VWR-12984 VWR-13996 VWR-14426 + VWR-24247 SNOW-84 SNOW-477 SNOW-744 -- cgit v1.2.3 From d0a25a41848142e469f5d64f4e4cef3852d3b2ab Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Wed, 15 Dec 2010 20:12:17 +0100 Subject: VWR-24252: On standalone, find Qt4 with find_package, and find llqtwebkit. If Qt and/or llqtwebkit is found in a non-standard place, you still have to set LD_LIBRARY_PATH yourself (to $QTDIR/lib) before running the viewer of course (or the webkit plugin will silently fail). --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/contributions.txt') diff --git a/doc/contributions.txt b/doc/contributions.txt index 511ed0db9f..b6bdc36d46 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -73,6 +73,7 @@ Aleric Inglewood VWR-13996 VWR-14426 VWR-24247 + VWR-24252 SNOW-84 SNOW-477 SNOW-744 -- cgit v1.2.3 From 5936ced3119b44fab35a6af29339e54feb08e8ff Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Wed, 15 Dec 2010 21:23:03 +0100 Subject: SNOW-240: Fix libjson naming madness, again, for standalone. SNOW-240 was actually about adding the whole search. While this has been done, there is one issue left: On linux (and remember, all of this is about standalone) the libjson packages of distributions don't have this complex compiler version baked into their name. See also the last comment on SNOW-240: https://jira.secondlife.com/browse/SNOW-240?focusedCommentId=205305&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-205305 This patch fixes this issue by first searching for libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so and when that fails search for the system package library file libjson.so. --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/contributions.txt') diff --git a/doc/contributions.txt b/doc/contributions.txt index b6bdc36d46..35a8256900 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -61,6 +61,7 @@ Aimee Trescothick Alejandro Rosenthal VWR-1184 Aleric Inglewood + SNOW-240 SNOW-522 SNOW-626 SNOW-756 -- cgit v1.2.3 From 85446c8cf1da95d0119e0b643144f2959bfa2088 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Wed, 15 Dec 2010 22:44:21 +0100 Subject: VWR-10579: Fix NDOF.cmake to do the right thing on standalone. The old one just assumed that libndof is installed, even on standalone. This patch looks for it on standalone, unless configured with -DNDOF:BOOL=OFF, and when not found prints an error message (including telling about -DNDOF:BOOL=OFF). --- doc/contributions.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc/contributions.txt') diff --git a/doc/contributions.txt b/doc/contributions.txt index 35a8256900..05e5e0f43c 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -67,6 +67,7 @@ Aleric Inglewood SNOW-756 SNOW-764 VWR-10001 + VWR-10579 VWR-10759 VWR-10837 VWR-12691 @@ -215,6 +216,8 @@ Catherine Pfeffer Celierra Darling VWR-1274 VWR-6975 +Cron Stardust + VWR-10579 Cypren Christenson STORM-417 Dale Glass @@ -591,6 +594,7 @@ Robin Cornelius STORM-422 VWR-2488 VWR-9557 + VWR-10579 VWR-11128 VWR-12533 VWR-12587 -- cgit v1.2.3 From a9021607235444c7b660985fdc35094c9782060f Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Thu, 16 Dec 2010 15:43:18 +0100 Subject: VWR-24251: Fix -DLL_TESTS:BOOL=ON on standalone when Tut is installed in a non-standard directory. If tut/tut.hpp isn't installed in a standard include directory all tests fail because the found include directory for tut isn't passed to the compiler. This patch fixes this by passing it. Note that using include_directories() in a Find*.cmake file is bad practise. The correct way is to set an include dir variable and call include_directories() once. It certainly doesn't work for the tests anyway because the tests are all over the place and include_directories is on a per folder basis. What is needed is to set it for each (test) target. However, there is no TARGET_INCLUDE_DIRECTORIES. The closest thing that we have is to set the COMPILE_FLAGS property for a target. Fortunately, standalone is only used for linux, so we can just use -I${TUT_INCLUDE_DIR} to get the effect we want. --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/contributions.txt') diff --git a/doc/contributions.txt b/doc/contributions.txt index 05e5e0f43c..f33af2599d 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -75,6 +75,7 @@ Aleric Inglewood VWR-13996 VWR-14426 VWR-24247 + VWR-24251 VWR-24252 SNOW-84 SNOW-477 -- cgit v1.2.3 From 3f5d67bcb751858c20121e1f85a63a447ed13903 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Mon, 20 Dec 2010 16:10:07 +0100 Subject: VWR-24261: Configuration with cmake 2.8 is extremely slow Add non-broken FindZLIB.cmake. --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/contributions.txt') diff --git a/doc/contributions.txt b/doc/contributions.txt index f33af2599d..d4252f9ff5 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -77,6 +77,7 @@ Aleric Inglewood VWR-24247 VWR-24251 VWR-24252 + VWR-24261 SNOW-84 SNOW-477 SNOW-744 -- cgit v1.2.3 From 86380bb177b9e18e345bc302efb3a84b2c5758a9 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Wed, 15 Dec 2010 20:55:10 +0100 Subject: VWR-24254: Add support for using ld.gold on linux. To use ld.gold configure with: -DCMAKE_EXE_LINKER_FLAGS:STRING="-Wl,-use-gold". ld.gold links the viewer on my machine in 8 seconds, as opposed to 19 seconds with ld.bfd. Moreover, it uses a LOT less memory during linking (about 750 MB instead of 2.5 GB!). VWR-24254: Don't link with fontconfig on non-linux. While we already added fontconfig in the above patch, that code turned out to also be used by Windows and Darwin (contrary to the comments in the code). After looking at the history of commits and a discussion on IRC it was decided that the original coder (Kyle Ambroff ) really meant (LINUX AND VIEWER) instead of (NOT LINUX OR VIEWER). --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/contributions.txt') diff --git a/doc/contributions.txt b/doc/contributions.txt index d4252f9ff5..67f611ced6 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -77,6 +77,7 @@ Aleric Inglewood VWR-24247 VWR-24251 VWR-24252 + VWR-24254 VWR-24261 SNOW-84 SNOW-477 -- cgit v1.2.3 From 551bfb88fce8a9cd6faac440e3d89d79213550ed Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 17 Dec 2010 07:29:27 -0500 Subject: Adjust parameter in call to setFocusOnAvatar to be more efficient (don't animate) --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/contributions.txt') diff --git a/doc/contributions.txt b/doc/contributions.txt index 67683204e2..7b4ccc2b91 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -359,6 +359,7 @@ Jonathan Yap STORM-679 STORM-596 STORM-726 + STORM-785 Kage Pixel VWR-11 Ken March -- cgit v1.2.3