d33bb1fe67
merge
2014-12-22 10:06:45 -05:00
e5771553c1
merge latest trunk changes
2014-12-22 08:26:47 -05:00
f6abe4a228
Merge backout of forcing DEBUG_PREBUILT setting.
2014-12-19 16:47:06 -05:00
77edde1752
Backed out changeset 4356b6a222c7: forcing DEBUG_PREBUILT output.
...
It appears that our trouble was due to a cygwin-style path in the AUTOBUILD
environment variable, and that changeset 0e0bd8b546ad fixed it.
2014-12-19 16:42:26 -05:00
027899963c
merge with 3.7.23-release
2014-12-19 23:20:47 +02:00
35d141967a
Defend against cygwin-style AUTOBUILD path in environment.
2014-12-19 15:58:20 -05:00
72aae0db66
Automated merge with ssh://bitbucket.org/lindenlab/viewer-tools-update
2014-12-19 15:37:31 -05:00
651b73368b
Sort include(...) lines to make it easier for a person to verify.
2014-12-19 15:34:12 -05:00
b9be170403
Force DEBUG_PREBUILT on in Prebuilt.cmake to debug failures on TC.
2014-12-19 15:16:13 -05:00
277e3268cf
Merge viewer-release and become 3.7.24
2014-12-19 10:52:24 -08:00
1333e9332a
merge changes for 3.7.23
2014-12-19 09:09:20 -05:00
b0f590f6ab
Pull merge from lindenlab/viewer-release
2014-12-19 06:00:48 -08:00
d0d5a6a15c
DD-286 : Made stock folders in inventory do checking on paste and drop. Also prevent creation of items in stock folders
2014-12-18 22:16:44 -08:00
fae23034ad
Automated merge with ssh://bitbucket.org/lindenlab/viewer-tools-update
2014-12-18 18:17:24 -05:00
4ec9bce3c2
increment viewer version to 3.7.24
2014-12-18 14:02:41 -05:00
ff64d73691
Added tag 3.7.23-release for changeset 3be800e1afad
2014-12-18 14:02:41 -05:00
797f221e67
MAINT-4708 better grouping of ack messages between viewer and server
2014-12-18 20:05:36 +02:00
bab0cf6e9f
Merge downstream code and become 3.7.24
2014-12-19 11:11:02 -08:00
e7fca4af50
merge latest changes for windows
2014-12-18 09:48:44 -05:00
7b2045e734
allow signed vs unsigned compare in gcc
2014-12-18 09:47:27 -05:00
04a5080b67
MAINT-4726 FIXED Strange camera roll when using freeze frame in snapshot floater
2014-12-18 12:10:40 +02:00
df5006eac9
Update autobuild to point to new version of jsoncpp and change lib names to match those in package
2014-12-17 19:29:30 -08:00
b265b899d4
Update autobuild to point to new (VS2013) Havok files and fix up name mismatch
2014-12-17 16:24:31 -08:00
ca6736807e
include Prebuilt.cmake before using macro
2014-12-17 17:57:17 -05:00
6a552963a4
Remove reference to Windows version of GTK/ATK/Pango in autobuild - not used
2014-12-17 14:56:14 -08:00
2385cac566
Move the cmake package tracking files under the packages directory
2014-12-17 16:57:48 -05:00
87a033d3bf
merge
2014-12-17 15:54:26 -05:00
6bea6bfa45
Delete misleading comment about testing llcapabilitylistener.
...
There was a comment in CMakeLists.txt left over from 2009 (!) about commenting
out the unit test for llcapabilitylistener. Fortunately we've since reinstated
the test as an integration test, but the comment was never removed -- until now.
2014-12-17 14:57:41 -05:00
4666497507
merge up to latest changes from callum and nat
2014-12-17 14:28:58 -05:00
11ecd9a2d9
many package updates (mostly linux)
2014-12-17 13:14:49 -05:00
2714ecea21
adjust cmake not to attempt loads of packages on the wrong platforms
2014-12-17 13:13:41 -05:00
f8ed44f8ec
merge latest updates from nat and callum
2014-12-17 11:15:31 -05:00
0d71baba74
Produce error message, not traceback, when test program doesn't build.
...
A traceback from a Python script always makes people think there's a bug in
your script. Even when a test program fails to build, CMake often (always?)
tries to run it anyway, via our run_build_test.py script. For that case,
produce a straightforward error message -- rather than an OSError traceback
that doesn't even mention the program name!
2014-12-17 11:10:33 -05:00
3b7d3cb1ea
For one use case, boost::bind() better than boost::phoenix::bind().
...
We use boost::phoenix::placeholders::arg1 to imply a whole lambda expression,
replacing boost::lambda. But to bind a plain function in a more
straightforward way, seems classic boost::bind() works while
boost::phoenix::bind() does not.
2014-12-16 15:17:24 -05:00
210c95b283
Remove Visual Studio workaround for lack of std::fpclassify().
...
Visual Studio 2013 evidently does provide std::fpclassify(), so we no longer
need the funky local alias.
2014-12-16 14:03:57 -05:00
6793fa569b
Fix another empty #elif to plain #else.
2014-12-16 13:55:15 -05:00
1bd8a67dcb
Isolate #pragma clang to __clang__ compilations.
...
It's very irritating that Visual Studio produces a warning for unrecognized
#pragmas, which we then merrily turn into an error -- #pragma is inherently
compiler-specific!
2014-12-16 13:54:29 -05:00
f179fcd000
merge
2014-12-16 10:49:22 -05:00
211c18d3b7
linux build fix
2014-12-16 10:47:58 -05:00
6539fe4a67
SL-92 WIP - track appearance message timing
2014-12-16 09:14:18 -05:00
cce5bb5dae
SL-92 WIP - more debug line monitoring, changed AppearanceHover block to be optional.
2014-12-15 17:03:34 -05:00
f884c008d5
fix for some std::pair/STL syntax
2014-12-15 13:35:03 -08:00
d23803c74e
Merge with head
2014-12-15 10:10:38 -08:00
71c70117dd
Add feature (enabled) to turn off media plugins
2014-12-15 10:10:18 -08:00
11ab03331f
include quicktime package only on windows
2014-12-15 13:02:12 -05:00
37cd872f40
include libuuid and fontconfig only on linux
2014-12-15 13:00:47 -05:00
062c13364b
don't include glext on Mac where it is not used
2014-12-15 12:57:56 -05:00
9960145ed0
remove redundant include of Audio.cmake
2014-12-15 12:52:26 -05:00
dab5acd972
merge changes for 3.7.22-release
2014-12-15 12:34:18 -05:00
00f3850fe2
DD-299 : Suppress cap hardcoded fallback. Recheck cap after each teleport.
2014-12-14 15:48:46 -08:00
Brad Payne (Vir Linden)