Commit Graph

403 Commits (9edad026f4494de1a6f02ecc3f477faa27a361ef)

Author SHA1 Message Date
andreykproductengine bb7ac16318 MAINT-5532 FIXED upload of duck.dae from MAINT-4483 crashes mac viewer 2015-08-20 20:25:58 +03:00
andreykproductengine d9341caf45 MAINT-5364 FIXED Object with invalid sculpt topology type cannot be seen or selected 2015-07-17 17:36:33 +03:00
andreykproductengine d43cef4ed5 MAINT-5364 FIXED Object with invalid sculpt topology type cannot be seen or selected 2015-07-14 16:29:36 +03:00
ruslantproductengine 75ffe90b0c MAINT-5042 FIXED SL Viewer Closes Unexpectedly in specific area with high RenderVolumeLODFactor
- fix for review
- fix in buffer overrun detector
2015-04-27 18:21:39 +03:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
ruslantproductengine e76f352501 MAINT-5042 FIXED SL Viewer Closes Unexpectedly in specific area with high RenderVolumeLODFactor
- fix for review
- fix in buffer overrun detector
2015-04-27 18:21:39 +03:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Ansariel 9be423524d Merge LL V3.7.27 2015-04-14 22:08:31 +02:00
Ansariel 6c1e1760e4 FIRE-14525: Pull relevant part for current version of fix for MAINT-4435 2015-04-06 18:52:08 +02:00
callum_linden 23711c9275 Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013 2014-12-10 08:44:08 -08:00
ruslantproductengine 1be14992c6 MAINT-3494 FIXED Generate Normals checkbox does not control generation of normals.
Patchset #2
2014-12-02 12:09:50 +02:00
ruslantproductengine b3c8a559f6 MAINT-3494 FIXED Generate Normals checkbox does not control generation of normals. 2014-11-28 18:17:54 +02:00
ruslantproductengine 4364a8cccd MAINT-3529 FIXED Certain pathcuts made to a cube cause some faces to not react to sunlight or local lights 2014-11-24 18:41:51 +02:00
ruslantproductengine 366bcd0cbc MAINT-4435 FIXED fix in llvolume.cpp Perform full build if number of vertices
less than allowed. Changes in all other files relate auxiliary methods for
catching similar bugs in future.
2014-10-27 17:10:08 +02:00
callum_linden da97612b98 Update to build on Xcode 6.0: removed bunch of unused consts variables [-Wunused-const-variable] 2014-10-17 14:34:37 -07:00
callum_linden a38e89bf11 Update to build on Xcode 6.0: clang detecting unsigned int comparison with >=0 [-Wtautological-compare] - confirmed fix with davep 2014-10-17 14:27:56 -07:00
callum_linden c02ba7ceb5 Update to build on Xcode 6.0: collection of similar possibly incorrect logical comparison grouping [-Wlogical-op-parentheses] fixes for clang 2014-10-17 14:17:58 -07:00
Nicky 9a2ec62c02 Threadsafe version of ~LLProfile. 2014-06-24 21:13:33 +02:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Nicky b4e7faee77 FIRE-13814; Octree fixing.
- Do not create octree children that can cause precision problems.
- Error out when trying to put more than 8 children into a parent. That would just overwrite memory.
- Add logging for hte future.
2014-05-27 14:46:02 +02:00
Richard Linden 5866bb7ef0 merge with release 2014-02-12 10:32:02 -08:00
Tank_Master 7b2cc02863 Merge LL fitted mesh 2014-02-06 00:41:33 -08:00
Xiaohong Bao e2d14cfd47 fix crash at line 2207: llassert(dst->isFinite3()) in llvolume.cpp 2014-02-04 21:32:11 -07:00
Drake Arconis e5b0670ad7 OPEN-195 Cleaned non-UTF8 safe characters 2013-11-13 19:27:17 -05:00
Richard Linden 17e9c872ad Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-11-11 19:17:49 -08:00
Richard Linden 04397a095a more buildfix 2013-10-21 12:29:33 -07:00
Richard Linden 1acceb3633 changed ll_aligned_(malloc|free) to take alignment size as a template argument 2013-10-14 10:18:41 -07:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Richard Linden 59628d6f85 Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-10-01 14:28:39 -07:00
Tank_Master 3603c4f992 Merge ll 3.6.11 2013-11-23 20:22:24 -08:00
Graham Linden 29216ac5e7 MAINT-3179 fix bad indexing of position info generating false alarms on range checks, issue with free of data now allocated contig with positions instead, and added copious amounts of llwarns to error return sites so 'invalid element' will be a reason to read the log and not a tease. 2013-09-23 13:43:01 -07:00
Graham Linden 95e34d86b9 The unbearable lightness of being norspec 2013-09-18 18:24:16 -07:00
Dave Parks cacefaf2fc MAINT-2811 Fix for infinite loop on octree code during teleport. 2013-08-30 15:55:20 -05:00
Graham Linden 62011c2871 Fix merge issues from genBBoxes optimizations fighting with genBBoxes optimizations and missing statics 2013-08-19 12:56:04 -07:00
Graham Linden 3f186aab77 Merge in viewer-release 2013-08-19 12:10:40 -07:00
Graham Linden e285d515d5 NORSPEC-281 bring back a classic normal generation fix from runitai's personal collection 2013-09-26 11:32:57 -07:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden a2e22732f1 Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Graham Linden c5fc5d9b46 NORSPEC-323 fix norm/tangent gen for prim caps 2013-07-28 15:43:10 -07:00
Xiaohong Bao 52f292c063 Merge 2013-07-23 23:07:16 -06:00
Graham Linden 705a0ab677 NORSPEC-288 WIP fixes the issue with normal gen, but may be a bigger perf hit than we want 2013-06-25 11:16:27 -07:00
Dave Parks 79029149a4 Automated merge with file:///F:%5Cviewer-bear 2013-06-21 12:51:29 -05:00
Richard Linden a2a6bf20d7 merge with release 2013-06-20 16:46:23 -07:00
Dave Parks 4e46ce5520 MATBUG-204 Fix for crash in genVolumeBBoxes 2013-06-20 17:17:28 -05:00
Dave Parks ccd04cd66c Occlusion culling overhaul. 2013-06-18 17:24:21 -05:00
Graham Linden fec6ab591e Disable asserts in CalculateTangentArray (discussed with davep) to avoid debugging interruptions from bad assets 2013-06-14 09:32:23 -07:00
Dave Parks 7b28a9a541 Remove some now useless assertions. 2013-06-13 14:38:51 -05:00
Graham Madarasz 9726f3774d Backout tangent assert experiment 2013-06-12 10:26:06 -07:00
Graham Madarasz d2b253f1f6 Changes to protect against use of normalize3fast on degenerate vectors 2013-06-12 09:16:19 -07:00
Graham Madarasz 48324a9383 Fix issues with NaNs in tangent data from using normalize3fast on zero-length vectors and other data conditioning; also added assert to normalize3fast to make finding these problems easier in the future 2013-06-12 08:09:29 -07:00
Graham Madarasz 01f595d871 Speculative fix for tangent calc asserts on Mac 2013-06-11 12:02:54 -07:00
Dave Parks d09f1e7117 NORSPEC-242 Followup, fix a couple more sources of NaN and infinity. 2013-06-10 16:01:53 -05:00
Dave Parks ddf15867e4 NORSPEC-242 Fix for infinity and NaN showing up in tangents and texture coordinates sometimes. 2013-06-07 16:18:37 -05:00
Dave Parks c3f14b915c NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent calculator instead of binormal calculator, convert binormal centric code to tangent centric) 2013-06-03 12:50:48 -05:00
simon ec5bd94d59 BUG-2581 : [simon-ll-viewer-cat] Path cut, hollow and slice break planar
texture mapping on prims.  Credits to DaveP
2013-05-15 11:00:00 -07:00
simon 5687b0c4df Merge 2013-05-09 15:30:49 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
Dave Parks dbfcd6c9c5 Optimization -- don't draw glow in alpha pool unless needed 2013-05-07 17:20:33 -05:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Graham Madarasz (Graham Linden) 9a811855b9 Merge 2013-03-13 16:16:17 -07:00
Graham Madarasz (Graham Linden) bba84a3fa9 Cleanup per code review of prev change with DaveP 2013-03-13 13:38:30 -07:00
Graham Madarasz (Graham Linden) 5d2fea6262 Move fast memcpy to llcommon and use it in llalignedarray pushback on all platforms. Code Review: DaveP 2013-03-13 10:42:40 -07:00
Graham Madarasz e8b8a12b73 Mods to make compile on gcc 4.6.3 work mo betta 2013-03-12 10:48:05 -07:00
Graham Madarasz 1051220d4b Merged vwr-cat..#$%$% whitespace diffs 2013-03-11 12:41:06 -07:00
Graham Madarasz c04f4f66c8 Moved LLAlignedArray from llmath to llcommon and put template func impls in header to work around Mac 4.3.3 link issue. 2013-03-11 12:30:16 -07:00
Dave Parks f8e059deee MAINT-2371 Lat round of optimizations.
Reviewed by Graham
2013-03-08 17:11:30 -06:00
Graham Madarasz 1816582b92 Fix crashes from using single alloc for pos/norm/tc in volume face data fighting with old free call in model loading code 2013-03-06 09:09:07 -08:00
Dave Parks 586025bde5 Automated merge with https://bitbucket.org/lindenlab/viewer-cat 2013-03-04 18:06:29 -06:00
Dave Parks 609ed855e1 MAINT-2371 More optimizations.
Reviewed by Graham
2013-03-04 18:01:42 -06:00
Graham Madarasz (Graham) 4e81a84abd Performance improvements. Faster threadsaferefcount, faster instancetracker, use hashtable and pre-hashed strings for GLSL uniform lookup, and use dup_handles curl interface to avoid re-initing ares resolvers expensively. 2013-03-04 08:57:58 -08:00
Dave Parks f5e5396c3a MAINT-2371 First set of profile guided optimizations.
Reviewed by Graham
2013-02-26 15:15:08 -06: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 017cd12d52 Parenthesis, parenthesis, parenthesis 2013-10-12 21:40:03 -06:00
Tank_Master 119ce81029 Merge viewer bear updates + merge fixes 2013-09-23 22:10:59 -07:00
Tank_Master 0c314a0e6f Merge LGPL 2013-09-21 16:59:50 -07:00
Tank_Master 05ad3a1c29 Merge Viewer-bear (merge of materials + fixes) to FS-exp 2013-09-21 11:44:46 -07:00
Tank_Master 5519c39beb Merge Viewer-bear (Materials 3.6.6 RC) 2013-09-16 16:18:33 -07:00
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
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
Tank_Master 718f6fa0ff merge LL 3.6.1 2013-07-10 00:23:23 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
prep e0432f98ee SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance. 2012-11-28 16:36:34 -05:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Dave Parks 4127f3e7fc reapply efcec3eb374f: MAINT-646 Factor std::vector out of lloctree 2012-09-20 09:48:56 -04:00
Dave Parks cf98064700 reapply 52b6c9168974: MAINT-646 Factor std::set out of lloctree 2012-09-20 09:48:55 -04:00
Dave Parks 9ec263d2f1 MAINT-1503 Minimal set of changes needed to safely disable tcmalloc 2012-09-12 15:44:36 -05: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
Dave Parks 980d5a7555 MAINT-1503 Fix for ll_aligned_realloc returning non-aligned pointers on linux 2012-08-31 16:30:58 -05:00
Nicky 8e4d6926af Convert to Unix EOL. 2013-03-23 13:02:36 +01:00
Tank_Master 7fab30cab4 update NACL Graphics crasher protection code. (work done by Chalice of NACL - 26104; 1799bdb6549e) 2013-03-20 10:11:16 -07:00
Tank_Master 6207030884 Merge FS LGPL tip 2013-02-23 17:09:53 -08:00
Tank_Master e1ee0494bf Merge FS LGPL 2013-02-08 00:14:47 -08: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
Ansariel 1195f259ba Added megaprim crash fix in octree from NaCl / Chalice Yao 2013-01-27 15:28:15 +01:00
Tank_Master 93d4b47252 Merge LL 3.4.1 beta 10 2012-10-26 09:59:19 -07:00
simon@Simon-PC.lindenlab.com 173d0fa213 Pull in viewer-development because it's painful. Merge with runitai's help. 2012-07-11 16:15:23 -07:00
simon@Simon-PC.lindenlab.com b7555a3309 Merge back viewer-lion, which has viewer-development and down-stream fixes 2012-08-01 14:07:24 -07:00
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05: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
Dave Parks 6dd3840b44 MAINT-646 Factor std::vector out of lloctree 2012-06-05 13:32:18 -05:00
Dave Parks 92ee373e45 MAINT-646 Factor std::set out of lloctree 2012-06-05 12:55:17 -05:00
Brad Payne (Vir Linden) 542975b4c6 merge 2012-06-04 16:19:18 -04: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
Richard Linden 2ed1de224a Automated merge with http://hg.secondlife.com/viewer-development 2012-02-06 15:28:45 -08:00
Brad Payne (Vir Linden) b9376ab990 merge 2012-02-02 10:57:09 -05:00
Richard Linden 5a14a67e06 converted a bunch of narrowing implicit conversions to explicit 2012-02-01 13:03:46 -08:00
Dave Parks 18e7f1bffd SH-2889 Add visual auto-muting controls 2012-01-20 16:42:57 -06:00
Nicky ce608c6839 Optimize calculation of estimated triangles / LOG. Reuse old value if input parameters did not change. 2012-02-05 15:07:48 +01:00
Nicky 9f7c9cffa3 Merge up to 26380 / 19ccfae26929 (V/dev tip). 2012-02-02 19:38:24 +01:00
Brad Payne (Vir Linden) c8682722ad SH-2789 WIP - aligned alloc and realloc 2011-12-21 17:02:47 -05:00
Dave Parks c0b4ec6fe7 SH-2694 Fix for FPS drop when mousing over flexi objects (don't use an octree for flexi raycast) 2011-12-16 17:43:30 -06:00
Brad Payne (Vir Linden) e68d5e248f SH-2789 WIP - add asserts to check object address alignment where needed 2011-12-14 16:18:19 -05:00
Nicky 161c1b019f Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
Dave Parks 76bd8cee11 SH-2644 Fix debug display that shows selection triangle count and streaming cost 2011-11-10 14:48:48 -06:00
Brad Payne (Vir Linden) 4b269f67ea merge 2011-09-14 14:54:20 -04:00
Xiaohong Bao 8cef480b96 fix for SH-2311: crash at LLVOVolume::lineSegmentIntersect line 3435
and SH-2358: Crash in LLError::crashAndLoop: Invalid face index
2011-08-29 18:15:38 -06:00
Dave Parks f7d17cad5c SH-2188 Fix for generally bad vertex buffer updates for rigged attachments and fix for viewer always thinking meshes initially have 8 texture entries. 2011-08-17 12:55:32 -05:00
Dave Parks 5c0df02df5 SH-2147 Clarify and quiet log spam on mesh LoD unzip failure. 2011-08-15 12:18:06 -05:00
Leyla Farazha 10ec004912 merge from viewer-experience 2011-08-12 14:53:25 -07:00
Brad Payne (Vir Linden) dd3069127b merge 2011-07-13 14:57:23 -04:00
Oz Linden 8529c37dee merge changes for storm-1488 2011-07-11 06:16:19 -04:00
Don Kjer b9d6b5ef9a Merge viewer-development -> mesh-development 2011-07-08 18:25:07 -07:00
Brad Payne (Vir Linden) 7541e6e31b SH-2014 FIX 2011-07-08 14:45:02 -04:00
Dave Parks d50093cb42 SH-1926 Fix for blocking legitimate sculpt maps with over-eager area check. 2011-07-05 11:51:32 -05:00
Xiaohong Bao f83b08b69c fix for SH-1878: Viewer hang in GLOD_Group::adaptTriangleBudget during LLModelPreview::genLODs;
SH-1891: viewer crashes while previewing "RYOMA 3D XML File.dae";
SH-1890: Crash loading palm tree
2011-06-24 15:09:10 -06:00
Nyx (Neal Orman) 7201d55396 BUILDFIX: linux build broken - abs() used instead of fabs()
linux caught the fact that we're using an integer absolute value function
when we should be using a floating-point version.
2011-06-20 17:18:43 -04:00
Dave Parks 15235061e8 SH-828 Fix for using uninitialized data when normals or texture coordinates are absent from collada file (can now upload meshes without normals or texture coordinates). 2011-06-18 01:02:03 -05:00
Dave Parks 91fe50ecc7 SH-1802 Fix for disappearing meshes under some circuimstances. 2011-06-09 17:03:53 -05:00
Dave Parks 75e366dd6f merge 2011-06-09 00:29:37 -05:00
Dave Parks b6e7d771da SH-1696 Protect against sculpt triangle bombs by turning high-surface area sculpties into spheres. 2011-06-09 00:23:46 -05:00
Dave Parks ca5a87b819 merge 2011-06-08 15:59:11 -05:00
Dave Parks e135d4d629 SH-1767 Fix for crash when viewing assets uploaded by mesh-asset-deprecation viewers 2011-06-07 15:28:05 -05:00
Dave Parks aa21ad59aa Fix for crash when viewing asset with "NoGeometry" 2011-06-06 18:20:07 -05:00
Dave Parks b77e027fcc Remove some unused variables. 2011-06-02 23:46:26 -05:00
Dave Parks de5f93ca52 SH-1732 Add streaming cost calculation for mesh objects. 2011-06-02 22:58:57 -05:00
Dave Parks 3a409e6edc SH-1603 Replace every occurrence of "WTF" with something more appropriate. 2011-05-25 18:45:21 -05:00
Dave Parks 8017900e7f merge 2011-05-12 18:50:22 -05:00
brad kittenbrink 2a843e9a6b Fix up alignment problems for debug build.
reviewed by davep.
2011-05-12 16:09:42 -07:00
Dave Parks 56ba23d231 Use SSE for decoding texture coordinates. 2011-05-11 17:32:39 -05:00
Loren Shih 8b4b2e375d Fix for line endings style (dos2unix).
Updated header blocks for llphysicsshapebuilderutil classes.
2011-05-03 15:31:30 -04:00
Dave Parks 1ff7968312 SH-1225 Add skinning info to import path of .slm files. 2011-03-28 23:50:23 -05:00
Dave Parks 6ff87e2840 SH-1169 Import from slm instead of dae when appropriate. 2011-03-22 17:23:48 -05:00
Dave Parks a242129b57 SH-523 Fix for non-finite values in silhouette rendering resulting in silhouette segments pointing at center of screen. 2011-02-08 15:53:50 -06:00
Xiaohong Bao d08372f71d merge fix for SH-659 from v-d to mesh: small textures not loaded 2011-02-01 12:43:12 -07:00