Commit Graph

373 Commits (9edad026f4494de1a6f02ecc3f477faa27a361ef)

Author SHA1 Message Date
Ansariel a8d3d16809 Merge Firestorm LGPL 2017-05-22 22:45:47 +02:00
Brad Payne (Vir Linden) 806fd24704 merge 2017-05-22 21:09:07 +01:00
Ansariel dcac0dce59 Merge viewer-bear 2017-05-07 13:11:50 +02:00
Nicky 03e7dc1a6f Merge with fs-lgpl. 2017-04-04 16:25:22 +02:00
Ansariel afef92cafc Merge asset-http 2017-03-20 17:13:42 +01:00
Rider Linden 880be86cf2 MAINT-7196: Viewer changes supporting new Allow Access Override opition for estate owners. 2017-03-10 15:07:55 -08:00
Brad Payne (Vir Linden) f028290c9e SL-409 - added size stats to metrics for textures 2017-03-07 08:06:03 -05:00
Ansariel 07d91c5d19 Merge asset-http 2017-03-06 22:48:05 +01:00
Brad Payne (Vir Linden) 015463c731 merge 2017-03-06 14:42:48 -05:00
Nat Goodspeed 1771857e6c Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-03-06 14:27:29 -05:00
Brad Payne (Vir Linden) f70abb4ad6 SL-409 - added tracking for bytes fetched to viewer assets metrics (does not currently work for textures) 2017-03-03 15:14:09 -05:00
Brad Payne (Vir Linden) fdfa832f4d SL-409 - simple script to summarize viewer metrics logs of asset fetches 2017-03-01 18:10:24 -05:00
Nicky 16aa95b0c6 Windows; Make autobuild build and clean work again. 2017-02-05 21:05:04 +01:00
Ansariel dd69a22834 Merge viewer-bear 2017-01-27 09:42:51 +01:00
Nicky 2290d5ed16 Merge with viewer64, first pass. 2017-01-10 19:33:15 +01:00
Brad Payne (Vir Linden) 971ea9f3d7 MAINT-7005 - added ability to set base priority and joint priority in anim_tool.py 2016-12-21 16:18:51 -05:00
Oz Linden 295a4c63b4 merge changes for 5.0.0-release 2016-12-05 17:40:04 -05:00
Oz Linden 3a8aa2d13d add viewer channel and version to the beginning of the About box Licenses information 2016-12-02 10:59:06 -05:00
Ansariel ca3b38fd27 Merge Firestorm LGPL 2016-11-30 20:33:20 +01:00
Ansariel 05c6c72b15 Add build switch to generate time-limited test builds. Use via --testbuild <days> 2016-11-30 15:41:15 +01:00
Ansariel bc32feea42 Merge Firestorm LGPL 2016-10-15 14:09:17 +02:00
Nicky dfd3d3f2dc Remove HAVE_QUICKTIME_3P cmake option, Quicktime on Windows is finally dead. 2016-10-14 15:15:01 +02:00
Brad Payne (Vir Linden) cf4e57f565 SL-455 - tweaks to skel_tool.py 2016-09-20 08:08:55 -04:00
Brad Payne (Vir Linden) 8df3092c8b SL-455 - tweaks to skel_tool.py 2016-09-20 08:08:55 -04:00
Ansariel 0c7abda3c8 Merge bento-box 2016-09-14 23:25:42 +02:00
Brad Payne (Vir Linden) a11538e034 SL-455 - skel_tool.py check for avatar_lad.xml slider symmetries 2016-09-12 16:50:32 -04:00
Brad Payne (Vir Linden) b5bbb9f5d5 SL-109 - in skel_tool.py, added check for bone drivers that don't do anything. 2016-09-12 10:48:35 -04:00
Brad Payne (Vir Linden) 5521066237 SL-109 - added another diagnostic option for skel_tool.py. --slider_info dumps the info about bone-affecting sliders to stdout 2016-09-02 08:15:54 -04:00
Ansariel 4acba68785 Merge bento-box 2016-08-11 00:16:36 +02:00
Brad Payne (Vir Linden) 9d8986337a SL-242 - fix for slider param groups, added default args for skel_tool.py 2016-07-08 15:36:50 -04:00
Ansariel 575c28239d Merge bento-box 2016-07-06 09:24:11 +02:00
Brad Payne (Vir Linden) b2a67c00b0 SL-353 - anim_tool.py has more reasonable default location for skeleton and lad files 2016-06-21 17:23:35 -04:00
Ansariel 88b928e1dd Merge bento-box 2016-06-16 00:53:56 +02:00
Brad Payne (Vir Linden) 27bb57126c SL-353 - additional anim_tool.py option, --num_pos, to enable creation of large test files 2016-06-14 10:54:30 -04:00
Brad Payne (Vir Linden) b5f4eab65b SL-117, SL-315 - resetSkeleton() tweaks, additional validation of skeleton file 2016-05-26 12:52:09 -04:00
Brad Payne (Vir Linden) 7a7973c6a2 SL-315 - arche_tool.py updates, resetSkeleton() now preserves mPelvis state, forces all params to be updated. 2016-05-25 16:40:08 -04:00
Brad Payne (Vir Linden) 806969c11c SL-315 - added arche_tool.py, a basic script for comparing 'Dump XML' output files 2016-05-25 09:40:45 -04:00
Ansariel f5065ec5b3 Merge bento-box 2016-05-21 19:59:03 +02:00
Ansariel 919521d121 Merge Firestorm LGPL tip 2016-05-21 19:02:00 +02:00
Brad Payne (Vir Linden) f47ceb47bb merged jelly-doll viewer-release into bento 2016-05-21 08:15:28 -04:00
Brad Payne (Vir Linden) a46fdc10c7 SL-315 - option to skip hud joints in anim_tool.py 2016-05-19 13:11:45 -04:00
Ansariel f6e502b6ef Merge bento-box 2016-05-18 20:34:55 +02:00
Brad Payne (Vir Linden) bb2c147c26 SL-315 - fix for max/linux build failure, additional lad validation in skel_tool.py 2016-05-18 09:06:46 -04:00
Brad Payne (Vir Linden) 184a5fd82b SL-315 - resetSkeleton() work, dae_tool.py can add random joint positions to models 2016-05-09 10:25:30 -04:00
Ansariel 62b508ed7e Merge bento-box 2016-05-09 13:15:50 +02:00
Brad Payne (Vir Linden) ec471497f5 SL-375, SL-378 - rudimentary logging info to list joint offsets during mesh import. dae_tool.py work to enable joint offset tweaking. 2016-04-29 11:25:17 -04:00
Brad Payne (Vir Linden) 3da9762eee SL-374, SL-375 - dae_tool.py for dae manipulation, initially to make joint offset test content 2016-04-28 13:44:36 -04:00
Brad Payne (Vir Linden) f3fb80c947 SL-344 - fixed a problem in avatar_lad with some params in wrong group, added diagnostics to make this easier to detect. 2016-04-27 17:19:09 -04:00
Ansariel 607625a1b5 Merge viewer-quickgraphics 2016-04-23 12:26:49 +02:00
Ansariel 5404f6382e Merge bento-box 2016-04-23 12:01:35 +02:00
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