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
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
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
4127f3e7fc
reapply efcec3eb374f: MAINT-646 Factor std::vector out of lloctree
2012-09-20 09:48:56 -04:00
cf98064700
reapply 52b6c9168974: MAINT-646 Factor std::set out of lloctree
2012-09-20 09:48:55 -04:00
9ec263d2f1
MAINT-1503 Minimal set of changes needed to safely disable tcmalloc
2012-09-12 15:44:36 -05:00
97d969a338
initial attempt to restore changes that make removing tcmalloc possible; not tested
2012-09-12 14:36:37 -04:00
a766e26db4
Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository.
2012-09-10 10:37:02 -07:00
980d5a7555
MAINT-1503 Fix for ll_aligned_realloc returning non-aligned pointers on linux
2012-08-31 16:30:58 -05:00
173d0fa213
Pull in viewer-development because it's painful. Merge with runitai's help.
2012-07-11 16:15:23 -07:00
b7555a3309
Merge back viewer-lion, which has viewer-development and down-stream fixes
2012-08-01 14:07:24 -07:00
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
6dd3840b44
MAINT-646 Factor std::vector out of lloctree
2012-06-05 13:32:18 -05:00
92ee373e45
MAINT-646 Factor std::set out of lloctree
2012-06-05 12:55:17 -05:00
542975b4c6
merge
2012-06-04 16:19:18 -04:00
635a264e6f
merge
2012-02-08 11:22:52 -05:00
2ed1de224a
Automated merge with http://hg.secondlife.com/viewer-development
2012-02-06 15:28:45 -08:00
b9376ab990
merge
2012-02-02 10:57:09 -05:00
5a14a67e06
converted a bunch of narrowing implicit conversions to explicit
2012-02-01 13:03:46 -08:00
18e7f1bffd
SH-2889 Add visual auto-muting controls
2012-01-20 16:42:57 -06:00
c8682722ad
SH-2789 WIP - aligned alloc and realloc
2011-12-21 17:02:47 -05:00
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
e68d5e248f
SH-2789 WIP - add asserts to check object address alignment where needed
2011-12-14 16:18:19 -05:00
76bd8cee11
SH-2644 Fix debug display that shows selection triangle count and streaming cost
2011-11-10 14:48:48 -06:00
4b269f67ea
merge
2011-09-14 14:54:20 -04:00
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
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
5c0df02df5
SH-2147 Clarify and quiet log spam on mesh LoD unzip failure.
2011-08-15 12:18:06 -05:00
10ec004912
merge from viewer-experience
2011-08-12 14:53:25 -07:00
dd3069127b
merge
2011-07-13 14:57:23 -04:00
8529c37dee
merge changes for storm-1488
2011-07-11 06:16:19 -04:00
b9d6b5ef9a
Merge viewer-development -> mesh-development
2011-07-08 18:25:07 -07:00
7541e6e31b
SH-2014 FIX
2011-07-08 14:45:02 -04:00
d50093cb42
SH-1926 Fix for blocking legitimate sculpt maps with over-eager area check.
2011-07-05 11:51:32 -05:00
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
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
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
91fe50ecc7
SH-1802 Fix for disappearing meshes under some circuimstances.
2011-06-09 17:03:53 -05:00
75e366dd6f
merge
2011-06-09 00:29:37 -05:00
b6e7d771da
SH-1696 Protect against sculpt triangle bombs by turning high-surface area sculpties into spheres.
2011-06-09 00:23:46 -05:00
ca5a87b819
merge
2011-06-08 15:59:11 -05:00
e135d4d629
SH-1767 Fix for crash when viewing assets uploaded by mesh-asset-deprecation viewers
2011-06-07 15:28:05 -05:00
aa21ad59aa
Fix for crash when viewing asset with "NoGeometry"
2011-06-06 18:20:07 -05:00
b77e027fcc
Remove some unused variables.
2011-06-02 23:46:26 -05:00
de5f93ca52
SH-1732 Add streaming cost calculation for mesh objects.
2011-06-02 22:58:57 -05:00
3a409e6edc
SH-1603 Replace every occurrence of "WTF" with something more appropriate.
2011-05-25 18:45:21 -05:00
8017900e7f
merge
2011-05-12 18:50:22 -05:00
2a843e9a6b
Fix up alignment problems for debug build.
...
reviewed by davep.
2011-05-12 16:09:42 -07:00
56ba23d231
Use SSE for decoding texture coordinates.
2011-05-11 17:32:39 -05:00
8b4b2e375d
Fix for line endings style (dos2unix).
...
Updated header blocks for llphysicsshapebuilderutil classes.
2011-05-03 15:31:30 -04:00
1ff7968312
SH-1225 Add skinning info to import path of .slm files.
2011-03-28 23:50:23 -05:00
6ff87e2840
SH-1169 Import from slm instead of dae when appropriate.
2011-03-22 17:23:48 -05:00
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
d08372f71d
merge fix for SH-659 from v-d to mesh: small textures not loaded
2011-02-01 12:43:12 -07:00
c7d0fab7b9
Fixes for merge up from viewer-development to mesh-development.
...
Backed out SH-659 since merge was messy; this will be merged in manually later.
2011-02-01 12:33:39 -05:00
fbc6e5d639
Automated merge up from viewer-development into mesh-development
2011-02-01 11:28:22 -05:00
f3493d4165
SH-822 Fix for crash in cacheOptimize (U16 should have been a U32)
2011-01-19 23:14:41 -06:00
c602fed9b7
fix for SH-659: small textures not loaded
2011-01-18 14:08:21 -07:00
ce5dc4d42b
SH-762 Forsyth style vertex buffer optimization for meshes.
2011-01-07 13:47:50 -06:00
e9d21ba941
Fix for windows build. Reviewed by Nyx.
2010-12-20 15:09:15 -06:00
8edd7e94b1
merged CTS-323: Don't cast pointers to U32
2010-11-23 01:52:11 +01:00
c149a0020b
Get rid of pointless redirection and malloc/free.
2010-11-21 03:06:47 -06:00
ffb8b78ae9
Reverting fix for SH-391 until it works for all use cases
2010-11-03 17:11:08 -07:00
117af7e7e3
Fix for SH-391 'Viewer crash when enabling align planar faces on a mesh object'. Paired with Runitai
2010-11-03 13:23:53 -07:00
ed29cac3a1
SH-92 Fix for busted bounding boxes for mirrored meshes.
2010-10-29 16:10:17 -05:00
78e62d0030
Fix for bad normals on some prim faces.
2010-10-29 12:06:20 -05:00
da04af47cc
Fix for bad binormals.
2010-10-26 16:19:24 -05:00
4f388eacf6
merged CTS-323: Don't cast pointers to U32
2010-10-24 16:13:31 +02:00
32b0747e33
CTS-323: (part 2 of 2) Don't cast pointers to U32
2010-10-24 16:07:43 +02:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
478e0927c8
Interface/state for rendering convex hull physics shapes. Still need to implement gMeshRepo.buildHull
2010-10-04 09:48:05 -05:00
11fce20134
Add llhysicsshapebuilderutil
2010-10-01 13:33:14 -05:00
569f3f4b06
Merge
2010-09-22 13:04:53 -07:00
6d8e9cd8bd
Commenting out unused variables to help mac build
2010-09-22 11:22:50 -07:00
cf09d6c58a
Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching type back into tools floater.
2010-09-22 03:04:21 -05:00
7d625ef060
merge
2010-09-22 01:44:44 -05:00
d40db3d8e1
SH-100, SH-111 Fix for generate normals stalling/crashing.
...
Switch from "new" to "malloc" in llvolume.cpp aligned arrays so "realloc" can be used to avoid copies.
2010-09-22 01:43:17 -05:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
c42ed54b0a
Stop using ll_aligned_malloc/free in llvolume.
...
Fix for garbage data in vertex weight array crashing software skinning.
Proper integration of picking for rigged attachhments.
Optimization in LLDrawable::updateDistance (don't call updateRelativeXform, just use spatial group position).
2010-09-20 18:45:56 -05:00
90da6d6fdc
Raycasting for rigged attachments now works for your own attachments while in edit mode.
2010-09-19 23:07:15 -05:00
3cda760638
Added test code for volume raycast octree and fixed a crash in render cost calculation when selecting trees/grass. Reviewed by jwolk.
2010-09-10 14:08:12 -05:00
1c286f6b0b
Merge cleanup.
2010-08-31 18:10:02 -05:00
e68f9e566b
merge
2010-08-31 16:37:40 -05:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
2fea1d5d33
Integrate SIMD API from oreh/server-trunk-oreh
2010-08-19 12:25:15 -05:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
129e31373e
Better < operator for LLVolumeFace::VertexData
2010-08-06 11:57:03 -05:00
93ea3d2850
Merge cleanup.
2010-07-15 14:17:51 -05:00
13202e744c
merge
2010-07-14 11:11:31 -05:00
2dd3a6be72
Fix for mesh upload, consolidate generating bad indices, and normal generation.
2010-07-13 12:02:14 -05:00
46768c3c6c
Merge?
2010-07-12 07:39:23 -05:00
66e353812f
Get meshes working post-SSE pass.
2010-06-15 19:16:39 -05:00
1b7b8aa00e
merge
2010-06-14 23:14:14 -05:00
6e37ec08f6
Builds with LLConvexDecompInter as a static lib.
2010-06-14 23:13:10 -05:00
2ff888d2bc
Unused variable.
2010-06-10 21:47:49 -05:00
1061c640d3
merge
2010-06-10 15:04:34 -05:00
d2d49e3d84
Fix for memcpyNonAliased16 issues.
2010-06-10 15:02:41 -05:00
9440f84dca
Potential fix for busted binormals on cubes.
2010-06-10 14:58:02 -05:00
Nyx Linden