Commit Graph

373 Commits (9edad026f4494de1a6f02ecc3f477faa27a361ef)

Author SHA1 Message Date
Oz Linden dd0d9319d9 make the About... / Licenses tab more readable by adding blank lines 2016-04-20 17:51:30 -04:00
Ansariel 472215b46c Merge bento-box 2016-04-14 14:29:20 +02:00
Brad Payne (Vir Linden) 5adc782341 SL-353 - improved handling of skeleton and lad options in anim_tool.py 2016-04-13 16:53:17 -04:00
Brad Payne (Vir Linden) 9012a8a087 SL-338 - added --set_version to anim_tool.py, for creating files to test upload of unsupported file versions. 2016-04-12 11:09:54 -04:00
Brad Payne (Vir Linden) 67eb559dc7 SL-344 - additional sliders, additional avatar_lad validation in skel_tool.py 2016-04-11 21:19:22 -04:00
Ansariel c27194d97e Merge Firestorm LGPL 2016-03-31 18:46:28 +02:00
Ansariel 8144c54661 Merge bento-box 2016-03-31 18:46:06 +02:00
Ansariel a818913ab3 Add support for AVX2 optimizations (available for Windows only so far) 2016-03-29 15:57:02 +02:00
Brad Payne (Vir Linden) 5574e3bbaa SL-353, SL-344 - basic avatar_lad validation in skel_tool.py script. 2016-03-25 10:28:30 -04:00
Brad Payne (Vir Linden) bf9626c0a9 SL-353 - bento: utilities for skeleton and anim file manipulation. 2016-03-24 13:32:05 -04:00
Nicky 5c73246c10 Only use indra/newview/VIEWER_VERSION.txt 2016-02-24 22:50:08 +01:00
Ansariel ce470a6427 Just for consistency since everything else is in caps... 2016-01-28 19:14:23 +01:00
Nicky 8f22fbee51 Add --quicktime switch to build with media_plugin_quicktime and enable it for ReleaseFS (Windows only). 2016-01-26 16:38:35 +01:00
Nicky 38837a0162 Revert accidental commit. 2016-01-18 12:32:35 +01:00
Nicky 6988580777 OpenJPEG 1.4 is default for now. 2016-01-17 13:13:05 +01:00
Ansariel de285ab9b2 Merge Firestorm LGPL tip 2016-01-13 12:34:40 +01:00
Nicky 4ffd74e025 Remove leapmotion, it's outdated and unsupported. 2016-01-06 13:59:08 +01:00
Ansariel ffbabb46e4 Merge viewer-bear 2015-11-06 19:35:20 +01:00
andreykproductengine d048afe845 MAINT-5743 Fixed Remove gpu_table and references to it from viewer packaging 2015-11-02 20:31:15 +02:00
Nicky 757d07e2e6 Update for import_to_branch.sh: revert override inis. 2015-08-07 11:25:30 +02:00
Oz Linden 949942c730 merge changes for 3.7.29-release 2015-06-08 16:33:02 -04:00
simon a219cf1c98 Merge viewer-release 2015-04-15 15:07:13 -07:00
Oz Linden a49e11efd9 remove check-viewer-xml (moved to the viewer-test-tools repo) 2015-04-14 10:44:16 -04:00
Oz Linden 6b9b4c91d1 Detect running under cygwin and fail gracefully 2015-04-09 11:12:47 -04:00
Oz Linden 136a925536 add script to check xml files written by the viewer 2015-04-02 16:01:17 -04:00
Oz Linden 8e21b24a07 merge changes for 3.7.26-release 2015-03-23 14:34:31 -04:00
Nicky 245d1ee3df Win64: Split the clean step into a few smaller steps. Otherwise NTFS can be pretty slow and leading to timeouts during automated builds. 2015-07-20 09:33:29 +02:00
Ansariel 4ce6691cf8 Merge viewer-xp_tools 2015-06-25 11:57:17 +02:00
Nicky 33f1513c45 Add option to use ninja instead of make. 2015-06-20 20:09:45 +02:00
Nicky 586798c834 Cache type for NDTARGET_ARCH 2015-05-27 12:07:29 +02:00
Nicky 996de24dbc Clean for Win32/64 was not deleteing the right directory. 2015-05-11 13:56:06 +02:00
Nicky 55f65bce71 Pass -m64 down to autobuild during "box" step, or the wrong packages end up in the resulting .txt-file. 2015-05-08 15:52:59 +02:00
Nicky fc51c75740 After configure: Set active configuration in VS2013 solution. 2015-05-08 12:55:51 +02:00
Nicky 6f8e09253a Ignore autobuild reporting the same package multiple times. 2015-05-08 11:18:42 +02:00
Nicky 3bfc9aa8d9 Configure for VS2013. 2015-05-05 14:14:58 +02:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Nat Goodspeed 355d006851 Rationalize use of AUTOBUILD environment variable across languages.
Ensure that AUTOBUILD is always in native path syntax on every platform.
Remove local build.sh logic to infer AUTOBUILD: either the generic build.sh
has set it properly, or scream for help.
Since cygwin bash scripts need a cygwin-syntax path to autobuild, convert to a
local 'autobuild' variable using shell_path.
Remove kludges in other languages involving cygdrive twiddling.
2015-01-08 16:48:29 -05:00
Nat Goodspeed 3d98ef6b08 Remove obsolete build script with ancient, erroneous hardcoded paths. 2015-01-08 16:44:27 -05:00
Nat Goodspeed 9635923d55 Temporarily work around cygwin /cygdrive/c pathname in AUTOBUILD. 2014-12-22 15:27:28 -05:00
Brad Payne (Vir Linden) 6539fe4a67 SL-92 WIP - track appearance message timing 2014-12-16 09:14:18 -05:00
Nat Goodspeed 20de60576f Wrap call to autobuild in some diagnostic code.
Hopefully this will make certain errors clearer, notably failure to launch
autobuild due to "cannot find the file specified".
2014-12-12 14:33:20 -05:00
Brad Payne (Vir Linden) c9981ec59c SL-92 WIP - hover height communicated via appearance messages. 2014-12-08 13:12:28 -05:00
Oz Linden 680194deaf automate keeping the About SL -> Licenses tab correct 2014-11-21 18:09:12 -05:00
Nicky 9ee7fd74bb Add autobuild.xml to revert step. 2015-04-15 11:42:06 +02:00
Tank_Master d06a0217d9 Merge LL 3.7.26 2015-03-23 12:29:56 -07:00
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
dolphin 73b277b83b Fixed windows line endings 2013-12-09 13:47:41 -08:00
dolphin 27cf0ec7f3 Merge with 3.6.11 2013-12-02 15:44:02 -08:00
dolphin c2c060d440 Merge with 3.6.7 2013-10-04 09:19:25 -07:00
Tonya Souther b28c82a76d Enable --avx switch on Linux. Requires at least GCC 4.6.0. 2014-01-27 03:35:23 -06: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
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
dolphin 09964ec6ed Created an experience specific permissions dialog. 2013-09-24 19:10:43 -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
Kitty Barnett d5f93071b5 Merge with RLVa tip for viewer-sunshine 2013-02-15 19:26:00 +01:00
Tank_Master ea86bb88c3 first pass merge 2013-02-04 10:52:32 -08:00
Tonya Souther ee7bf28a04 Make --jobs option work on OS X with Xcode 4. 2013-01-21 15:35:11 -06:00
ziree 5c3130fa40 Added compiler swith for Linux to override autodetected number of compile jobs - Followup - typo fix 2013-01-21 11:50:00 +01:00
ziree f3abe0e35e Added compiler swith for Linux to override autodetected number of compile jobs. Prevents issues on processors that report a lot of cores but only have hyperthreading, also can save memory while compiling. 2013-01-21 11:34:40 +01:00
Tonya Souther a6df1b36c2 FIRE-8231: Fix compiling on Mountain Lion (OS X 10.8). Found by Shin Wasp. 2012-11-16 14:25:21 -06:00
Cinders d145a7701f FIRE-8063: Add Open Region Settings panel to the Region Info floater for aurora-sim; Add IsInAuroraSim() to fsgridhandler 2012-10-28 14:23:32 -06:00
Arrehn f6898ac3e6 Clean build robustness and line formatting fixes 2012-09-15 11:51:08 -04:00
ZiRee 4b4e14ab27 Only unfocus the main chat bar if deselect chat is enabled. 2012-02-04 23:19:51 +01:00
Oz Linden 066d63022b fix typo in flag for -u option 2011-10-06 16:30:32 -04:00
Oz Linden 466b9d7aeb add --diff option to display change report, other minor improvements 2011-09-23 10:18:01 -04:00
Oz Linden 0665d3f2e6 lowercase gpu string and recognizers in gpu_table_tester to match the behavior of the real code 2011-09-13 10:51:31 -04:00
Oz Linden 5b42f6f25b modify gpu_table_tester to lowercase things the way that the real gpu table parser does 2011-09-13 10:00:03 -04:00
Oz Linden 3958c5fe71 make script executable 2011-09-12 12:10:46 -04:00
Oz Linden 9df77524fc only include the h file when it is being created, and make the #endif in the h file safer for picky compilers 2011-09-12 07:21:22 -04:00
Oz Linden 49d0e291d8 add templates for use with hg-tools/create.py 2011-09-11 10:01:38 -04:00
Dave SIMmONs d6f7526abf Merge 2011-05-24 14:28:25 -07:00
Oz Linden 5eb6cb8d86 merge up latest viewer-development (post mesh) 2011-05-18 07:33:08 -04:00
Don Kjer 0a86e39d90 Merge with viewer-development (mesh) 2011-05-17 21:01:36 +00:00
Oz Linden 27fd0d1a93 storm-1100: merged many more updates and refinements to table, added tester and files to test with 2011-05-13 13:27:56 -04:00
Dave SIMmONs 37c15d211b Merge 2011-04-05 10:36:41 -07:00
Oz Linden a03f6997d8 update message template hash to correct value 2011-04-01 12:08:03 -04:00
Oz Linden d0ba2bc847 pull latest changes from viewer-development 2011-04-01 09:52:37 -04:00
Oz Linden cf4d929888 STORM-956 update message template 2011-04-01 06:49:19 -04:00
Kelly Washington 6540ccd307 Updated message template hash. 2011-03-31 16:15:48 -07:00
Christian Goetze (CG) 44ad672b9e Apply server side code to message template verification onto the viewer tree. 2011-03-31 15:43:47 -07:00
Kelly Washington 0080ed8e29 Merge 2011-03-31 14:07:54 -07:00
Dave Parks 675e0cfd99 Use tcmalloc from 3p-google-perftools on windows 2011-04-11 14:12:49 -05:00
Loren Shih 47781184fc Automated merge up from viewer-development into mesh-development 2011-04-04 10:42:52 -04:00
Kelly Washington f360ce118d Add template .sha1 2011-03-03 12:14:10 -08:00
Kelly Washington 6e97ead181 Add early exit to message template check if it hasn't changed. 2011-03-03 12:05:40 -08:00
Loren Shih dfafbf9f12 Automated merge up from viewer-development into mesh-development 2011-02-18 10:23:08 -05:00
Oz Linden c190189057 merge changes for storm-937 2011-02-17 14:56:33 -05:00
Merov Linden 10cf492ef1 STORM-937 : Use subprocess instead os commands in python, suppress crufty svn code 2011-02-11 16:56:28 -08:00
Merov Linden 896bc12a2b STORM-937 : Fix python scripts shebang line and license header for consistency 2011-02-09 15:23:07 -08:00
Merov Linden 01dd9929e2 STORM-937 : Makes all python paths use consistent syntax 2011-01-28 16:00:57 -08:00
Andrew A. de Laix e4392e6ae9 bye bye install.py... 2011-01-14 15:38:30 -08:00
Loren Shih 5f99331f4a Automated merge up from viewer-development 2010-12-29 13:23:02 -05:00
Aleric Inglewood 429e0caf17 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).
2010-12-15 17:31:18 +01:00
Loren Shih bfd8efb057 Automated merge up from viewer-development 2010-12-01 10:55:24 -05:00
Christian Goetze (CG) 0670e889f9 Replace template verification code with an md5sum check. 2010-11-16 12:15:00 -08:00
Nicky affb24b4f6 FIRE-3974; Don't let newlines sneak into LL_CHANNEL. 2011-12-12 21:33:13 +01:00
Tonya Souther 8f8922b1d6 OS X Lion build fix: remove GCC_VERSION=4.2 only if building on Lion. 2011-11-08 21:22:47 -06:00
Arrehn 8092fcf434 FIRE-3718, more robust hostname lookup, spelling fixes in configure_Firestorm.py. Thanks Miguael Liamano 2011-10-29 01:12:59 -04:00
Arrehn 7394730eaa Merge up to LL FUI 2011-10-28 02:00:09 -04:00
Arrehn 7fb04b35f3 Take2, make sure we clean up skin & resource files when packaging. 2011-10-22 10:23:16 -04:00
Arrehn d731bb3744 Backing package-clean work out for now. 2011-10-21 13:03:04 -04:00
Arrehn 650d3ba62d Updates to last commit, more robust across platforms 2011-10-21 12:58:23 -04:00
Arrehn 68d22220fb Clear previously packaged resource files prior to each 'package' build. 2011-10-21 11:17:00 -04:00
Arrehn fc3eaffc0d Always replace old build logs, even on quick rebuilds 2011-10-09 20:46:00 -04:00
Tonya Souther 5ae11b0677 Fix version number in OS X Get Info.
The version number in this patch will get overlaid during the build process.
2011-09-04 12:40:16 -05:00