Commit Graph

314 Commits (293b35f000ca4e8a4bcf85dc4782b2a72d1887ea)

Author SHA1 Message Date
Loren Shih d0cba9e919 Automated merge up from viewer-development into mesh-development 2011-01-24 10:56:40 -05:00
Oz Linden 7a453b7c93 add missing entry in contributions.txt for VWR-24347 2011-01-21 16:20:29 -05:00
Aleric Inglewood ee6a40beb1 VWR-24519: make debugging easier by not spawning spare process 2011-01-21 16:02:38 -05:00
Aleric Inglewood 97a9211d87 VWR-24354: correct manifest dependencies to prevent parallel install problem 2011-01-21 15:48:12 -05:00
Oz Linden 790dfe7556 merge changes for storm-844 2011-01-21 15:29:40 -05:00
Oz Linden 4652e26196 merge changes for storm-869 2011-01-21 15:14:39 -05:00
Loren Shih 38f4bad925 Automated merge up from viewer-development 2011-01-21 10:36:29 -05:00
Aleric Inglewood c47ab36b20 VWR-24320: remove dump of call stack on clean exit 2011-01-20 16:01:27 -05:00
Aleric Inglewood a873ae55a3 VWR-24317: remove warning due to unassigned variable 2011-01-20 15:57:07 -05:00
Aleric Inglewood 42604a1080 VWR-24315: update cached control values when resetting debug setting to default 2011-01-20 14:35:04 -05:00
Aleric Inglewood 80d7432ce6 VWR-13040 - clean up LLObjectSelection iterator 2011-01-20 14:26:57 -05:00
Jonathan Yap 3571e83b64 STORM-869 Minor irregulaties in settings.xml -- remove duplicate entries, formatting cleanup 2011-01-19 06:02:08 -05:00
Oz Linden 74fdba8295 merge changes for vwr-24420 2011-01-17 10:30:36 -05:00
Kitty Barnett 1d7b46e2c3 VWR-24217: allow Contents folder from object to be dragged to inventory 2011-01-17 10:09:52 -05:00
Jonathan Yap 6a3d06deca STORM-844 Better way of doing "More" should be "Less" when Media Control is open
thanks to Twisted Laws
2011-01-16 12:10:44 -05:00
Loren Shih 584c7ecb4e Automated merge up from viewer-development 2011-01-13 10:28:15 -05:00
Merov Linden c020c5c0f3 STORM-723 : pull in viewer-development 2011-01-12 12:01:44 -08:00
Merov Linden 40cd81f423 STORM-615 : pull in viewer-development 2011-01-12 11:18:19 -08:00
Jonathan Yap e27ae655c6 STORM-844 Minor adjustment to contributions.txt 2011-01-12 10:37:15 -05:00
Jonathan Yap 3703f0bb0d STORM-844 "More" should be "Less" when Media Control is open 2011-01-12 08:24:38 -05:00
Loren Shih fdf19a5268 Automated merge up from viewer-development 2011-01-10 11:20:39 -05:00
Thickbrick Sleaford fe28f89e7e merge VWR-24420 into v-d 2011-01-09 18:29:56 +02:00
Thickbrick Sleaford db1a63e99e FIX VWR-24420 Keep alpha channel in PNG images with background color.
Remove code that composites RGBA PNG images that specify a background
color down to RGB.
2011-01-09 01:13:38 +02:00
Coaldust Numbers 8cfea0bab1 VWR-1095 fix for problems with uploads following bulk upload failure
de minimus contribution accepted without CA - Oz Linden
2011-01-07 15:08:42 -05:00
Loren Shih 61e3c95dbf Automated merge up from viewer-development 2011-01-07 10:14:33 -05:00
Oz Linden 894e98a708 merge changes for storm-812 2011-01-06 14:33:35 -05:00
Loren Shih b30ff3fb9a Automated merge up from viewer-development 2011-01-06 11:06:09 -05:00
Oz Linden eb0b8ab3ea merge changes for storm-825 2011-01-05 17:53:37 -05:00
Loren Shih 7c7527b672 Automated merge up from viewer-development 2011-01-05 15:10:39 -05:00
Oz Linden 78895f9e0c merge changes for storm-467 2011-01-04 16:45:08 -05:00
Oz Linden 05810f063d merge changes for storm-737 2011-01-04 16:43:26 -05:00
Oz Linden e4591a8518 merge changes for storm-466 2011-01-04 16:41:05 -05:00
Loren Shih 5f99331f4a Automated merge up from viewer-development 2010-12-29 13:23:02 -05:00
Wolfpup Lowenhar 44e6327674 STORM-825 : Reenable the LLMatrix3::orthogonalize test in llmath/tests/m3math_test.cpp
Removed the skipping of a working test as this was causeing a the test to fail
    building and thus not actualy running all the tests.
2010-12-28 19:14:33 -05:00
Jonathan Yap d420ca89b4 STORM-466 Put Twisted Laws name into contributions.txt 2010-12-28 05:32:43 -05:00
Merov Linden 0b74df6774 STORM-523 : pull into viewer-development 2010-12-27 21:21:01 -08:00
Oz Linden 14d830ca43 merge improved fix for STORM_785 2010-12-24 07:41:41 -05:00
Jonathan Yap 1ca028cd7b STORM-812 Make bottom buttons in Object Profile identical for single and multi-prim objects 2010-12-23 17:12:37 -05:00
Loren Shih c87142e5d7 Automated merge up from viewer-development 2010-12-20 12:44:56 -05:00
Jonathan Yap 09c7d38166 STORM-467 Fix for minimap zoom does not persist to the next session 2010-12-18 16:44:51 -05:00
Nyx (Neal Orman) fa17e848a6 Automated merge with https://hg.secondlife.com/mesh-development 2010-12-17 16:19:15 -05:00
Nyx (Neal Orman) 089f9d6d37 merging in fix for CTS-323 / SH-464 2010-12-17 16:06:32 -05:00
Kitty Barnett 452d9d5e3d Updated contributions.txt for STORM-799 and STORM-800 2010-12-17 15:15:10 +01:00
Jonathan Yap 551bfb88fc Adjust parameter in call to setFocusOnAvatar to be more efficient (don't animate) 2010-12-17 07:29:27 -05:00
Loren Shih ee0055f5af Automated merge up from viewer-development 2010-12-16 11:12:15 -05:00
Aleric Inglewood 86380bb177 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 <ambroff@lindenlab.com>) really
meant (LINUX AND VIEWER) instead of (NOT LINUX OR VIEWER).
2010-12-15 20:55:10 +01:00
Aleric Inglewood 3f5d67bcb7 VWR-24261: Configuration with cmake 2.8 is extremely slow
Add non-broken FindZLIB.cmake.
2010-12-20 16:10:07 +01:00
Aleric Inglewood a902160723 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.
2010-12-16 15:43:18 +01:00
Aleric Inglewood 85446c8cf1 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).
2010-12-15 22:44:21 +01:00
Aleric Inglewood 5936ced311 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.
2010-12-15 21:23:03 +01:00