Commit Graph

224 Commits (992ebe2c630cc34ecf77a527ca1b4fd6e29546c6)

Author SHA1 Message Date
Nicky 22e028c9ae Merge with lgpl tip. 2014-06-14 17:58:37 +02:00
Tonya Souther f012adc883 Fix --clean error on Win64 and clean the right thing on Linux 64. 2014-06-02 07:12:54 -05:00
Nicky a0dbdc3a96 Pass through of 64 bit switch to cmake. 2014-05-26 16:54:53 +02:00
Nicky f4727e358d Scripts for release merging. 2014-05-12 14:53:41 +02:00
Techwolf Lupindo 5285d311db More linux 64-bit build fixes. Add 64-bit parts to configure_firestorm.sh 2014-02-22 09:29:18 -05:00
Tonya Souther b28c82a76d Enable --avx switch on Linux. Requires at least GCC 4.6.0. 2014-01-27 03:35:23 -06:00
Cinders 1f3cf9bce2 Initial Leap Motion controller support, includes llleapmotioncontoller.* test code from Simon Linden
To build with Leap Motion support build with —leapmotion (Very unstable!)
2013-11-27 20:09:34 -07:00
Tank_Master 3603c4f992 Merge ll 3.6.11 2013-11-23 20:22:24 -08:00
Graham Linden 0103cac1dd Merge viewer-bear maint RC changes to get this build closer to the RC it will follow 2013-09-26 11:44:40 -07:00
Graham Linden b76c51b942 Merge viewer-storm-1552 changes for gpu/feature table stomp from wi-fi 2013-09-06 06:43:52 -07:00
Oz Linden 980802e468 STORM-1552: detect, ignore, and delete invalid feature and gpu table files 2013-09-05 22:06:16 -04:00
Oz Linden d5c9b7b8e5 fix header display for diff report 2013-08-29 09:56:44 -04:00
Oz Linden e51e79c4d4 truncate gpu id strings to 100 characters (avoids diff problems) 2013-08-07 18:04:03 -04:00
Oz Linden 4ae06c7e33 add line number of recognizer to diff report 2013-08-07 18:03:16 -04:00
Oz Linden c19f427ce1 update tester for new gpu_table.txt format 2013-07-10 14:35:25 -07:00
Oz Linden 3bb708d706 merge up to latest viewer-development for merge to 3.5.2 2013-04-19 14:42:56 -04:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Oz Linden 327c99cadb merge up to 3.5.2 development 2013-04-16 16:01:32 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
prep 8e3b190e91 merge 2013-03-11 15:17:13 -04:00
Nicky bd28032b66 Proper clean for Windows x64. 2013-10-22 23:06:07 +02:00
Nicky 565f941717 Merge with FS tip. 2013-10-17 00:37:15 +02:00
Cinders 7320729d7f Handle darwin compiler optimizations where they belong, in cmake not the bash script 2013-10-16 15:32:56 -06:00
Nicky ed4c40a7ab Merge with -lgpl 2013-10-14 20:57:33 +02:00
Tank_Master 52d9b07503 Merge viewer-bear 2013-09-12 21:15:34 -07:00
Nicky 16d455e0cf Merge. 2013-08-15 22:22:28 +02:00
Cinders 96a439b24c Oops, forgot to check for no-package in the arguments 2013-08-12 14:53:31 -06:00
Cinders 8c296032f5 Add --no-package flag to configure_firestorm.sh 2013-08-12 09:36:38 -06:00
Cinders 22fb8841be Snow leopard should be the exception, not the standard for building 2013-08-09 12:03:48 -06:00
Nicky b7679961e1 - Add dummy WiX & SLPlugin to autobuild.xml. Those are needed for 64 bit Windows (Precompiled 32 bit SLPlugin, WiX to create installer).
- Allow 64 bit build to package.
- Create proper packagge targets for 64 bit Windows.
2013-08-04 20:00:19 +02:00
Nicky 0addf213ed Merge with FS tip. First pass. 2013-08-02 00:40:48 +02:00
Nicky 1077938a72 Add 64 bit Windows support to our configure script. 2013-08-01 23:42:43 +02:00
Nicky 0ccd7b37f7 Only use -DUNATTENDED=ON when running on windows. cmake complains about it being not used on all other platforms. 2013-03-25 02:54:55 +01:00
Cinders 44cd20cb31 Add a --no-opensim flag to configure_firestorm.sh for good measure. 2013-07-10 21:28:17 -06:00
Cinders b04e370472 Trivial whitespace change in configure_firestorm.sh (make stuff line up) 2013-07-10 13:50:19 -06:00
Ansariel ea4e1eda82 Fix typo in configure_firestorm.sh 2013-07-10 21:11:39 +02:00
Cinders f426fba9f2 Support passing --opensim and --avx to build 2013-07-10 12:31:24 -06:00
Ansariel f81d31b0ca Fix build script to properly pull FmodEx 2013-07-10 11:58:46 +02:00
Tonya Souther c797878e42 Fix --chan argument to build command. 2013-07-10 04:08:31 -05:00
Cinders 4ce5358f89 Clean up build scripts post merge - Pass #1 2013-07-09 20:07:58 -06:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Tank_Master 14001c54df Gastly CHUI merge pass 1, don't count on anything to work. 2013-06-26 12:14:54 -07:00
Kitty Barnett b368a21202 Merged with Appearance-Misc tip
--HG--
branch : .RLVa
2013-02-04 21:06:34 +01:00
Oz Linden d7e90f4160 derive version number from indra/VIEWER_VERSION.txt 2013-02-07 11:56:57 -05:00
Brad Payne (Vir Linden) 87833a2485 Fixed issues with mixed grids - new message blocks now variable 2012-08-27 17:37:34 -04:00
Don Kjer 64d9705ae2 Expanding region flags to 64 bits. Adding region protocol flags 2012-08-17 03:56:38 +00:00
Don Kjer dfce4c451c Added AppearanceData block to AvatarAppearance message 2012-08-02 22:54:01 +00:00
Nicky 69acbfefd9 Rollback of 7efa369bc006 xcodebuild does not return a proper return value to trap build error this way. 2013-03-03 21:03:05 +01:00
Nicky dc30290267 Make configure/build always return a proper error code (1) on failure. 2013-03-02 18:50:30 +01:00
Tank_Master b7c25b12e2 Partial merge of LGPL repo 2013-02-20 01:48:25 -08:00