livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,063 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

362 Commits (0eaeb2fe348635bcbc02259b77680c2bfa0dcd2c)

Author SHA1 Message Date
Tank_Master 52d9b07503 Merge viewer-bear 2013-09-12 21:15:34 -07:00
Ansariel 992118ffc9 Backout fcb3339cfe08 (mesh deformer) for testing; might cause memory leak 2013-08-10 01:15:44 +02:00
simon b42b789723 Merge in downstream code (chui fixes, materials) 2013-04-11 16:18:34 -07:00
Brad Payne (Vir Linden) 5a436e46f6 SH-3959 WIP - pass information about type of fetched image - server bake, host bake, map tile, etc - down the chain so LLTextureFetchWorker can adjust behavior as needed 2013-03-08 17:07:17 -05:00
Graham Madarasz (Graham) 2e8b2558b4 For MAINT-2436 and MAINT-2388 contribs from STORM-1935 and STORM-1936 2013-03-07 14:13:14 -08:00
Graham Madarasz eda81f68ca For MAINT-1842 fix model validation to check for NaNs 2013-03-06 09:07:33 -08:00
Nyx Linden 11fe124ae9 merging in viewer-beta. 
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
 2013-01-24 16:22:49 -05:00
Cinders 0723683e83 Added Karl Stiefvater's mesh deformer, patch contributed by Inworldz LLC, updated for post-SSA Firestorm 
*Only OpenSim enabled at this point
 2013-07-11 13:31:12 -06:00
Dave Parks 8039c4583e MAINT-1567 cleanup some gcc warnings 2012-10-23 14:31:34 -05:00
Dave Parks 10697d59b6 MAINT-1567 Fix for incorrect triangle and hull counts in mesh importer. 
Reviewed by VoidPointer
 2012-10-23 13:35:11 -05:00
Dave Parks ec125540c4 MAINT-643 Fix for incorrect lighting and colors in preview displays. 2012-10-16 16:25:01 -05:00
Dave Parks 9b7bfcf594 MAINT-1568 Fix for inconsistent triangle counts when changing LoD sources in model importer 2012-10-12 17:25:17 -05:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Don Kjer 1f6e20c5bb Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture 2012-09-04 17:43:08 +00:00
Oz Linden 8df3619621 merge to viewer-developmento 2012-07-24 10:51:37 -04:00
Todd Stinson 4feef5af63 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-23 19:21:34 -07:00
Tank_Master 1d0498421d Merge SSA push 5 (part1, pre CHUI stuff) 2013-03-19 16:34:59 -07:00
Tank_Master 6207030884 Merge FS LGPL tip 2013-02-23 17:09:53 -08:00
Cinders 2c9e821188 Rename HAS_OPENSIM_SUPPORT switch to OPENSIM 2013-02-18 21:24:20 -07:00
Nicky 9c36a89265 FIRE-9233; Make sure to get a vertexbuffer that is suitable to pass into glod. 2013-02-18 20:05:47 +01:00
Tank_Master ea86bb88c3 first pass merge 2013-02-04 10:52:32 -08:00
Tank_Master 169263d8b0 Merge LL 3.4.5 beta 3 2013-01-28 01:56:00 -08:00
ziree d9334f98b9 Removed old, unused settings and code. 2013-01-06 18:27:59 +01:00
Ansariel a7707844fb Made no havok warning notification localizable & added German translation 2012-11-27 01:12:52 +01:00
Cinders 67b53bb122 Warn opensim users that they won't be able to use Havok features when they open the appropriate floaters with an alert. 
Also add a default substitution to our download url.
 2012-11-26 16:46:25 -07:00
Tank_Master 93d4b47252 Merge LL 3.4.1 beta 10 2012-10-26 09:59:19 -07:00
Cinder Roxley b6ed0e6930 FIRE-5782 - Threaded filepickers for uploads 2012-10-06 12:29:16 -06:00
Whirly 3b63bd8f08 FIRE-7937 : Adding dae import support for attachment point names. This patch allows ALL bones including all attachment points to be weighted to mesh and animated. Patch by Magus Freston. 2012-10-16 13:44:38 +01:00
Oz Linden 97d969a338 initial attempt to restore changes that make removing tcmalloc possible; not tested 2012-09-12 14:36:37 -04:00
William Todd Stinson a766e26db4 Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository. 2012-09-10 10:37:02 -07:00
prep f71d1db58d MAINT-1253 Rigged meshes in the upload model window now have a material applied instead of white. 2012-07-11 10:47:45 -04:00
Oz Linden 2c3e78f1f1 merge changes for DRTVWR-167 2012-06-27 14:18:22 -04:00
Dave Parks 9e9d32de38 merge 2012-06-22 14:04:33 -05:00
Oz Linden d500379cea PATH-735: Limit and clean up grid selection 2012-06-12 21:58:52 -04:00
Tank_Master 999bd2130e Merge LL 3.4.0 release 2012-09-13 15:19:30 -07:00
Tank_Master d9c7b9253d merge LL 3.4.0 viewer-beta 2012-08-31 00:18:30 -07:00
Tank_Master 8cb09ca444 Merge to FS LGPL 29865 2012-08-30 15:45:02 -07:00
Tank_Master cb24ec2e0d merge LL 3.3.4 beta 
autoreplace does not work (needs a hook in nearby chat), no cmd line option to add new stuff
spellcheck only works when packaged
 2012-07-16 21:59:14 -07:00
Tank@test_master.ftrdhcpuser.net 01c7d1eafb Merge LL pathfinding 
with help from Armin and NickyD
 2012-08-06 18:14:39 -07:00
Brad Payne (Vir Linden) 542975b4c6 merge 2012-06-04 16:19:18 -04:00
Dave Parks efda0814cb MAINT-616 Fix for corrupted mipmaps. Cleanup based on code review feedback. 2012-05-24 10:50:48 -05:00
Dave Parks b7cfd8c7f0 MAINT-616 Factor out calls to glGenFoo where possible, add setting to control synchronizing strategy WRT occlusion queries, add experimental transform feedback driven LoD update 2012-05-21 23:33:25 -05:00
Jonathan Yap dd5d7fadca STORM-1860 Remove obsolete code and file(s) for mesh model upload wizard 2012-05-18 12:12:42 -04:00
Armin Weatherwax 66d124ae8b make opensim support optional at build time 2012-06-15 17:22:40 +02:00
Tank_Master 7f8369d162 Backed out changeset: 6c209c0f9ed5 (grid panel will be reimplemented later) 2012-06-12 11:15:37 -07:00
Tank_Master 9c28ad2906 Backed out changeset: ac9f3b6b990a (grid panel will be reimplemented later) 2012-06-12 11:01:15 -07:00
Tank_Master 81439297d3 Small currency changes (by nhede Core from angstrom viewer) 2012-05-21 16:35:04 -07:00
Tank_Master 8b92e953a0 Adding Grid manager panel and button (by nhede Core from angstrom viewer) 
Also implemented dynamic currency symbol, and search browser using grid_info search url
 2012-05-21 16:27:25 -07:00
Tank_Master e61c20d499 Merge LL 3.3.1 Viewer Release 2012-04-26 17:31:35 -07:00
Brad Payne (Vir Linden) 635a264e6f merge 2012-02-08 11:22:52 -05:00