Ansariel
300eb0378b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-05-21 11:29:11 +02:00
Ansariel
6daf35217e
Update message template master URL
2020-05-21 00:35:09 +02:00
Nicky Dasmijn
cff453ff51
Merge remote-tracking branch 'eep/master' into fs-eep-vs2017
2020-05-20 13:49:20 +02:00
Brad Payne (Vir Linden)
c1698dc041
SL-13000 - standard params for jellied male/female avs
2020-05-13 21:09:48 +01:00
Nicky Dasmijn
a4aff377e6
Merge branch 'master' into fs-vs2017
2020-04-29 20:02:19 +02:00
Ansariel
f21941b369
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
2020-04-23 19:33:13 +02:00
Ansariel
db30295c98
Remove FMOD Ex and first round sync with upcoming changes from upstream
2020-04-08 22:29:21 +02:00
Ansariel
22dd92e012
Merge Firestorm
2020-02-21 11:53:36 +01:00
Nicky
0ce85ef3b8
Linux always builds (and always had been built) with OpenAL, make sure it is always enabled.
2020-02-15 10:22:19 +01:00
Ansariel
f6012f78f9
FIRE-29311: Fix building with OpenAL on Windows, based on a patch by Testicular Slingshot
2020-02-09 19:36:10 +01:00
Nicky
9ef897a178
exclude all tags/branches to always just get a git hash rather than an amalgamation of tag/branch and hash (which though is valid too).
2020-02-01 14:44:52 +01:00
Ansariel
dc2a972024
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-01-08 17:45:46 +01:00
Nicky
f238377c80
Bake git rev. hash into the viewer.
2019-12-29 23:27:02 +01:00
Nicky Dasmijn
7f9bce5ada
Merge branch 'master' into fs-vs2017
2019-12-21 01:52:19 +01:00
Ansariel
a571c4ceba
Merge Firestorm LGPL
2019-12-15 15:03:40 +01:00
Ansariel
d12c9550e9
Let's just go with revcount since we're going to build from tip anyway where it matters (this should be ok for LGPL and release repo)
2019-12-14 17:02:34 +01:00
Nicky
c1152886f7
Prepare for git:
...
- When configured from a git directory (crudely detected by testring for .git/ existance) use AUTOBUILD_BUILD_ID for the revision.
- Oterwise use the locale mercurial change number (as before).
2019-12-14 10:53:00 +01:00
Ansariel
b75b1eb789
Merge viewer-vs2017
2019-03-31 01:37:56 +01:00
Ansariel
2f3569d78b
Merge Firestorm LGPL
2019-03-21 17:13:44 +01:00
Ansariel
b95fcdf3b3
Some fixes for the build setup:
...
* Fix wrong lookup path for nghttp2.lib on Windows
* Fix missing details in output of configure_firestorm.sh script
* Fix circular link dependency in LLWindow, causing CMake CMP0038 warning;
viewer now builds with CMake 3.13.4 upwards (64bit CMake as well)
2019-03-08 00:03:30 +01:00
Ansariel
7ed3c52d63
Fix indention
2019-03-02 13:14:21 +01:00
Nicky
ff72f76489
Linux uses a slightly different directory to save breakpad symbols.
2019-03-01 20:59:10 +01:00
Ansariel
6e70616cf2
Merge Firestorm LGPL
2019-03-01 18:58:47 +01:00
Ansariel
218e719d24
Merge viewer-eep
2018-12-13 21:14:20 +01:00
Rider Linden
70ac8d9fa7
SL-10238: Viewer spport for push notifications from the simulator contaiting partial groups of settings. Blend these settings into the current environment.
2018-12-12 14:07:23 -08:00
Rider Linden
29130c5483
SL-10093: Client code to support experiences changing an environment. Handle generic messages with "commands" to be executed.
2018-11-20 10:59:38 -08:00
Ansariel
9735854226
Merge Firestorm LGPL
2018-11-16 18:10:32 +01:00
Ansariel
5532f87f80
Merge Firestorm LGPL
2018-11-16 00:09:19 +01:00
Rider Linden
1d022e86c8
Merge
2018-11-14 11:19:33 -08:00
Ansariel
051811ed62
Fix copy&paste error in configure_firestorm.sh script
2018-10-04 02:13:23 +02:00
Ansariel
db8e20101f
Create convenience option for singlegrid in configure_firestorm.sh script
2018-10-04 02:04:42 +02:00
Ansariel
717038bbd9
Merge axon
2018-09-28 00:00:03 +02:00
Ansariel
05d6e376ac
Merge Firestorm LGPL
2018-09-27 22:35:07 +02:00
Brad Payne (Vir Linden)
a84ee929a5
merge
2018-09-27 19:54:10 +01:00
Ansariel
0d04687377
Merge viewer-bugsplat
2018-09-27 00:21:50 +02:00
Rider Linden
78866b33a9
Merge
2018-09-26 13:46:45 -07:00
Ansariel
d5fdcd67ab
Merge axon
2018-09-25 17:45:20 +02:00
Ansariel
1733550573
Merge viewer-eep
2018-09-22 00:42:04 +02:00
Ansariel
4c25c8ef9f
Improve --testbuild command description
2018-09-12 18:13:28 +02:00
Brad Payne (Vir Linden)
e4e4ad3c09
SL-966 - animated object size/pos constraints cont, including some settings for debugging. additional options to anim_tool.py for making test animations
2018-09-10 20:13:35 +01:00
Ansariel
b075b3a435
Adjust configure_firestorm.sh to pass VIEWER_SYMBOL_FILE into CMake plus additional fixes on the way:
...
* Reduce platform parameters to darwin, windows, linux (win64 & linux64 aren't used at all, win32 renamed to windows)
* Introduce new parameter --crashreporting to enable crash reporting (Do NOT! use -DRELEASE_CRASH_REPORTING:BOOL=ON anymore - it won't work with new way symbols are generated!)
* Using --build on Windows now won't gloriously fail anymore - Did some ever even tried this before???
* Sync MSBuild command line options with options specified in autobuild.xml
2018-08-31 16:58:30 +02:00
Ansariel
1f02cfc1de
Merge viewer-neko
2018-08-16 14:51:06 +02:00
Nat Goodspeed
470e4b5afc
Merge in anim_tool.py refactoring from server-side script.
2018-08-09 18:49:25 -04:00
Rider Linden
b50d546d5f
MAINT-7699: More robust cap protocol, better support for delete and support for individual tracks, support for setting environment by asset id in the cap
...
MAINT-7703: Initial flags sent in message protocol for parcels
2018-08-03 16:13:22 -07:00
Ansariel
e054f434cf
Merge Firestorm LGPL
2018-02-12 18:50:42 +01:00
Ansariel
372d63747e
Remove Quicktime leftovers in configuration script
2018-01-31 16:52:46 +01:00
Ansariel
6ffbc1ed56
Remove references to GCC package override file
2018-01-31 16:31:41 +01:00
Tonya Souther
45e9b40be9
More OS X build fixes.
2018-01-27 08:40:18 -06:00
Ansariel
2bbfe64357
Remove reference to VS2013 64bit package override file
2018-01-25 10:54:05 +01:00
Ansariel
89e753a81d
Merge Firestorm LGPL
2018-01-17 21:20:40 +01:00
Brad Payne (Vir Linden)
e36745eb98
merge
2018-01-17 16:06:27 +00:00
Ansariel
fc9500e411
Merge Firestorm LGPL
2018-01-16 20:29:02 +01:00
Ansariel
20bffceffd
Merge Firestorm LGPL
2018-01-09 14:11:28 +01:00
Ansariel
5e1c9a92a8
Add support for FMOD Studio, originally by Drake Arconis (Alchemy Viewer), with FS-specific additions by Drakeo
2017-12-16 19:34:03 +01:00
Ansariel
32cbc9f98b
Merge viewer64
2017-11-05 12:46:02 +01:00
Nat Goodspeed
4c6ecac206
MAINT-7081: Make packages-formatter.py handle multi-line copyrights.
...
The nghttp2 autobuild package has copyright information that embeds a newline.
autobuild install --copyrights correctly produces that information onto two
lines. But that means packages-formatter.py must process any lines that do not
match its expected 'packagename: copyright' pattern as the continuation of the
preceding package's copyright information.
Since the processing for autobuild install --versions is so very similar, fold
both into the same outer loop.
Also report all duplicates for any package, instead of stopping at the first.
2017-09-27 15:25:29 -04:00
Ansariel
01d8e7e347
Merge axon
2017-09-20 01:09:14 +02:00
Brad Payne (Vir Linden)
936ccff59f
SL-751 - updated lsl test scripts with bug fix, added a version that uses the new command llGetObjectAnimationNames()
2017-08-31 16:48:26 +01:00
Ansariel
db266722b4
Clean up Firestorm configuration script
2017-07-29 12:56:12 +02:00
Brad Payne (Vir Linden)
22c8efc2ce
SL-731, SL-751 - added debug option DebugAnimatedObjects, updated LSL test script
2017-07-26 18:56:18 +01:00
Brad Payne (Vir Linden)
30880e062a
SL-751, SL-691 - test lsl scripts update, better syncing between skeleton and drawable
2017-07-21 20:01:40 +01:00
Ansariel
dd7580c4f9
Merge Firestorm LGPL
2017-07-21 08:54:52 +02:00
Brad Payne (Vir Linden)
bbe5681d05
SL-751 - added test script move_in_circle_using_llSetRegionPos.lsl
2017-07-20 20:51:06 +01:00
Brad Payne (Vir Linden)
41f7f7a68e
SL-751 - lsl scripts for control of animated objects within a region
2017-07-14 22:18:53 +01:00
Brad Payne (Vir Linden)
f55667397e
SL-722 - handle per-object animation requests, combine for control avatar animation state.
2017-07-06 01:25:10 +01:00
Brad Payne (Vir Linden)
2af5332e46
Added cycle_object_animations.lsl. Also change to test.cpp to see if it affects a g++ internal compiler error.
2017-06-30 21:59:39 +01:00
Brad Payne (Vir Linden)
4d29b95fb5
merge
2017-06-20 22:11:41 +01:00
Nat Goodspeed
a3066b7375
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-06-20 16:11:33 -04:00
Ansariel
5d84299cee
Merge Firestorm LGPL
2017-06-19 21:23:53 +02:00
Nicky
58bfdbefc8
Detect missing AUTOBUILD_VARIABLES_FILE environment variable and early fail configure (or later it will fail more cryptic due to missing LL_BUILD variable).
2017-06-19 02:12:57 +02:00
Nicky
446eaa8375
Merge with phoenix-firestorm-lgpl
2017-06-18 22:37:11 +02:00
Brad Payne (Vir Linden)
74957676fc
SL-694 - message changes for ObjectAnimation, more logging to validate behavior
2017-06-05 20:22:59 +01:00
Brad Payne (Vir Linden)
55612611c6
SL-694 - stub support for ObjectAnimation message type
2017-05-30 22:03:43 +01:00
Ansariel
c437e17160
Sync message template with master
2017-05-24 09:56:11 +02:00
Nicky
c4d7f25bac
Merge with phoenix-firestorm-lgpl.
2017-05-23 14:09:46 +02:00
Nat Goodspeed
fe64db61d6
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-05-22 21:30:26 -04:00
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
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