9a2ec62c02
Threadsafe version of ~LLProfile.
2014-06-24 21:13:33 +02:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
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
5866bb7ef0
merge with release
2014-02-12 10:32:02 -08:00
7b2cc02863
Merge LL fitted mesh
2014-02-06 00:41:33 -08:00
e2d14cfd47
fix crash at line 2207: llassert(dst->isFinite3()) in llvolume.cpp
2014-02-04 21:32:11 -07:00
e5b0670ad7
OPEN-195 Cleaned non-UTF8 safe characters
2013-11-13 19:27:17 -05:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
04397a095a
more buildfix
2013-10-21 12:29:33 -07:00
1acceb3633
changed ll_aligned_(malloc|free) to take alignment size as a template argument
2013-10-14 10:18:41 -07:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
59628d6f85
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-10-01 14:28:39 -07:00
3603c4f992
Merge ll 3.6.11
2013-11-23 20:22:24 -08:00
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
95e34d86b9
The unbearable lightness of being norspec
2013-09-18 18:24:16 -07:00
cacefaf2fc
MAINT-2811 Fix for infinite loop on octree code during teleport.
2013-08-30 15:55:20 -05:00
62011c2871
Fix merge issues from genBBoxes optimizations fighting with genBBoxes optimizations and missing statics
2013-08-19 12:56:04 -07:00
3f186aab77
Merge in viewer-release
2013-08-19 12:10:40 -07:00
e285d515d5
NORSPEC-281 bring back a classic normal generation fix from runitai's personal collection
2013-09-26 11:32:57 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
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
c5fc5d9b46
NORSPEC-323 fix norm/tangent gen for prim caps
2013-07-28 15:43:10 -07:00
52f292c063
Merge
2013-07-23 23:07:16 -06:00
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
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
4e46ce5520
MATBUG-204 Fix for crash in genVolumeBBoxes
2013-06-20 17:17:28 -05:00
ccd04cd66c
Occlusion culling overhaul.
2013-06-18 17:24:21 -05:00
fec6ab591e
Disable asserts in CalculateTangentArray (discussed with davep) to avoid debugging interruptions from bad assets
2013-06-14 09:32:23 -07:00
7b28a9a541
Remove some now useless assertions.
2013-06-13 14:38:51 -05:00
9726f3774d
Backout tangent assert experiment
2013-06-12 10:26:06 -07:00
d2b253f1f6
Changes to protect against use of normalize3fast on degenerate vectors
2013-06-12 09:16:19 -07:00
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
01f595d871
Speculative fix for tangent calc asserts on Mac
2013-06-11 12:02:54 -07:00
d09f1e7117
NORSPEC-242 Followup, fix a couple more sources of NaN and infinity.
2013-06-10 16:01:53 -05:00
ddf15867e4
NORSPEC-242 Fix for infinity and NaN showing up in tangents and texture coordinates sometimes.
2013-06-07 16:18:37 -05:00
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
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
5687b0c4df
Merge
2013-05-09 15:30:49 -07:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
dbfcd6c9c5
Optimization -- don't draw glow in alpha pool unless needed
2013-05-07 17:20:33 -05:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
9a811855b9
Merge
2013-03-13 16:16:17 -07:00
bba84a3fa9
Cleanup per code review of prev change with DaveP
2013-03-13 13:38:30 -07:00
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
e8b8a12b73
Mods to make compile on gcc 4.6.3 work mo betta
2013-03-12 10:48:05 -07:00
1051220d4b
Merged vwr-cat..#$%$% whitespace diffs
2013-03-11 12:41:06 -07:00
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
f8e059deee
MAINT-2371 Lat round of optimizations.
...
Reviewed by Graham
2013-03-08 17:11:30 -06:00
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
586025bde5
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2013-03-04 18:06:29 -06:00
609ed855e1
MAINT-2371 More optimizations.
...
Reviewed by Graham
2013-03-04 18:01:42 -06:00
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
f5e5396c3a
MAINT-2371 First set of profile guided optimizations.
...
Reviewed by Graham
2013-02-26 15:15:08 -06:00
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
017cd12d52
Parenthesis, parenthesis, parenthesis
2013-10-12 21:40:03 -06:00
119ce81029
Merge viewer bear updates + merge fixes
2013-09-23 22:10:59 -07:00
0c314a0e6f
Merge LGPL
2013-09-21 16:59:50 -07:00
05ad3a1c29
Merge Viewer-bear (merge of materials + fixes) to FS-exp
2013-09-21 11:44:46 -07:00
5519c39beb
Merge Viewer-bear (Materials 3.6.6 RC)
2013-09-16 16:18:33 -07:00
52d9b07503
Merge viewer-bear
2013-09-12 21:15:34 -07:00
992118ffc9
Backout fcb3339cfe08 (mesh deformer) for testing; might cause memory leak
2013-08-10 01:15:44 +02:00
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
718f6fa0ff
merge LL 3.6.1
2013-07-10 00:23:23 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07: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
8e4d6926af
Convert to Unix EOL.
2013-03-23 13:02:36 +01:00
7fab30cab4
update NACL Graphics crasher protection code. (work done by Chalice of NACL - 26104; 1799bdb6549e)
2013-03-20 10:11:16 -07:00
6207030884
Merge FS LGPL tip
2013-02-23 17:09:53 -08:00
e1ee0494bf
Merge FS LGPL
2013-02-08 00:14:47 -08:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
1195f259ba
Added megaprim crash fix in octree from NaCl / Chalice Yao
2013-01-27 15:28:15 +01:00
93d4b47252
Merge LL 3.4.1 beta 10
2012-10-26 09:59:19 -07: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
999bd2130e
Merge LL 3.4.0 release
2012-09-13 15:19:30 -07:00
d9c7b9253d
merge LL 3.4.0 viewer-beta
2012-08-31 00:18:30 -07: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
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07: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
ce608c6839
Optimize calculation of estimated triangles / LOG. Reuse old value if input parameters did not change.
2012-02-05 15:07:48 +01:00
9f7c9cffa3
Merge up to 26380 / 19ccfae26929 (V/dev tip).
2012-02-02 19:38:24 +01: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
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
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
d42dc0c367
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
7394730eaa
Merge up to LL FUI
2011-10-28 02:00:09 -04:00
87dd359b1c
Opensim - detect and use various configuration limits which might be different from SL, by ArminW
2011-08-28 07:10:09 -04: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
f9b13d8f85
Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of merge fixes.
2010-06-10 00:45:48 -05:00
9faf00b40f
merge
2010-06-04 12:08:16 -05:00
a8f0e47fd5
Normal debug display and fix for bad bump mapping and planar texture coordinates.
2010-06-04 12:07:55 -05:00
6ca40c7afb
more needed #includes
2010-06-04 09:10:00 +01:00
dc2f50642b
lots of _mm_malloc and _mm_free -> ll_aligned_malloc_16 and ll_aligned_free_16
...
more to come.
2010-06-04 08:54:03 +01:00
087b749908
fix scoping issues for gcc
2010-06-04 08:46:00 +01:00
26ba00b555
Vectorized octree and much of llspatialpartition and lldrawable.
...
Octree driven raycast.
2010-06-03 12:52:28 -05:00
9a869d6301
Octree triven raycast works, time to profile.
2010-05-29 19:55:13 -05:00
0e7f4dc5ce
Octree per LLVolumeFace WIP
2010-05-29 05:37:38 -05:00
c98b1b3fd9
Fully aligned llvolume
2010-05-26 03:29:19 -05:00
e6fe3b1f1a
Better vectorization of various things. Turn off debug gl by default.
2010-05-25 03:55:01 -05:00
c0b654dd4b
Fix for bad feeding of vectorized raycast.
2010-05-24 17:33:41 -05:00
52134bdc81
Merge
2010-05-24 13:38:16 -07:00
a2eb86b009
Ack. Fixed a bunch of stupid type mistakes in llvector4a.
2010-05-24 13:37:59 -07:00
8c32e3bf29
Fix for bad indexes on cube faces.
...
Extra validation on vertex buffers.
2010-05-24 14:03:10 -05:00
d7cab99ba7
Fix for a couple dumb mistakes.
2010-05-22 12:37:53 -05:00
4d57cb3c09
Vectorize/memory align buffers in llvolumeface WIP
2010-05-22 04:35:02 -05:00
8919f4811a
blah
2010-05-21 23:55:18 -05:00
b740924c9d
Make LLVolume::createSide a little faster.
...
(transplanted from 4d43e3b83ccffd725ec6cb234ddcfa0833f17a9f)
2010-04-28 02:53:12 -05:00
4a501bb437
Make LLVolume::createSide a little faster.
...
(transplanted from 4d43e3b83ccffd725ec6cb234ddcfa0833f17a9f)
2010-04-28 02:53:12 -05:00
d71716aa6d
Make LLVolume::createSide a little faster.
2010-04-28 02:53:12 -05:00
07c0389f50
Proper byte ordering when decoding skin weights.
2010-04-27 01:50:06 -05:00
47ffcdb93d
Rigged attachments (almost works).
2010-04-06 16:24:08 -05:00
807d835c2b
First draft of skin weights in .mesh asset
2010-04-02 14:43:05 -05:00
71d11af310
Mesh cache. Has a bug.
2010-03-13 17:39:32 -06:00
4c0e2f7921
"Generate Normals" is less busted now.
2010-03-11 12:02:37 -06:00
d60f5e937f
Tool tips for model preview. Rename "Impostor" to "Lowest"
2010-03-09 14:28:06 -06:00
3c78771ace
Removed scale from model importer.
...
Removed support for scale entry in mesh assets.
Fixed MeshMaxConcurrentRequests being ignored.
Added mesh download queue debug text.
2010-02-24 22:02:01 -06:00
066f9de07e
Fix for normals getting squished on consolidation.
...
Replaced some magic numbers with constants.
Switched up throttling of mesh upload HTTP posts to prevent overloading one capability at a time.
Added some feedback on upload progress via debug text.
Made debug text move with side panel (keep debug text from rendering on top of side panel).
2010-02-23 16:57:06 -06:00
ee80367128
16-bit limit awareness when consolidating models.
2010-02-17 18:08:00 -06:00
3bca0fceb2
merge
2010-02-17 11:33:47 -06:00
ffcbbf4aaa
Multi-threaded asset uploading with proper ordering first draft.
2010-02-11 18:00:00 -06:00
44cfa948c7
merge.
2010-02-11 11:19:51 +00:00
792ebb1936
CID-423
...
Checker: UNINIT
Function: LLVolume::cleanupTriangleData(int, const std::vector<LLVolume::Point, std::allocator<LLVolume::Point>> &, int, int *, int &, LLVector3 **, int &, int **)
File: /indra/llmath/llvolume.cpp
The code looks right, I'm just adding an llassert().
2010-02-10 16:49:56 +00:00
bf087b74d3
merge
2010-02-09 12:28:31 -06:00
2cb5b0b66e
consolidate button work in progress
2010-02-09 12:26:09 -06:00
6d4b4762d1
merge
2010-02-09 11:23:33 -06:00
bd10ded1da
index off for tristrip fix on davep's tristrip optimization
2010-02-23 18:03:37 -08:00
42df75bafe
Enable FBO multisampling for OSX.
...
Fix bad triangle in prim caps.
2010-02-08 10:14:11 -06:00
adf601ef1f
Draw prims using triangle strips instead of triangle lists.
2010-02-06 17:33:12 -06:00
095a5e8440
Draw prims using triangle strips instead of triangle lists.
2010-02-06 17:33:12 -06:00
024c0ebe19
enable mirror and invert flags for meshes.
2010-01-29 14:33:04 -06:00
512a5736dc
LODs for scene upload
2009-12-23 14:40:48 -06:00
0afe1fd41d
Applied (manually in places) diff from svn.lindenlab.com/svn/linden/branches/render-pipeline/render-pipeline-7@135361 to get deferred rendering changes from the svn branch. Bleh!
2010-03-26 13:19:01 -07:00
081fa98a47
HTTP Mesh transfer relatively blocking-free.
2009-12-15 17:43:05 -06:00
695969c770
HTTP Mesh fetch FTW.. still busted
2009-12-11 14:47:11 -06:00
bb2631180a
CTS-4 Only part of an uploaded mesh renders.
2009-12-01 17:40:52 -06:00
f039fa98ef
Fix for silly crash due to LLPrimitive having 0 texture entries.
2009-11-30 17:02:38 -06:00
062a2dd309
Remove zero area triangles from meshes post-import.
2009-11-30 15:32:10 -06:00
6d66910c6e
Fix for spam on invalid mesh asset.
...
Fix for index buffer overflow spam and crash in llvertexbuffer.
2009-11-25 11:35:41 -06:00
62233f2246
Fix for copying of tetrahedrons in place of mesh LODs.
...
Fix for bad tetrahedron bounding box.
Bad fix for simultaneous loading of multiple LODs.
2009-11-24 07:38:04 -06:00
81bfdcbfae
Tetrahedron displays in place of unloaded mesh. Still has some LOD issues.
2009-11-18 18:10:48 -06:00
c02702f387
CTS-7 Add hard edge threshold capability to normal generation.
2009-11-13 17:01:56 -06:00
6f3536d597
Merged in viewer 2 changes, adjusted xui problems, added mesh folder type and more mesh inventory type info
2009-11-11 15:16:49 -08:00
4e420a36c6
Fix for missing LOD spam.
2009-11-07 08:22:39 -06:00
35e200881c
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
2009-11-06 06:52:24 +00:00
10069e0e13
Fix for prims all being 0 lod.
...
Fix for dangling prim references.
2009-11-05 19:58:10 -06:00
88292104d9
Fix for crash when loading some meshes.
...
Added button to auto-fill LODs.
2009-11-04 14:19:05 +00:00
3e80fa3dbc
Sync up with render-pipeline-7 ignore-dead-branch
2009-11-02 19:55:37 +00:00
406927f629
Merge a big bunch of fixes from maint-viewer. Hooray.
...
svn merge -r136066:136073 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer/maint-viewer-24-qa-9
DEV-8553 New Server Tools - Prep Land For Sale
DEV-32942 (QAR-1521) Bad border crossings or TP / Ruthing issues
DEV-32942 (QAR-1521) Bad border crossings or TP / Ruthing issues
DEV-33239 VWR-13816: Resizing the Search Window Causes the Results to Refresh back to First Page
DEV-27746 Running a dev build of Second Life will make console window show up on non-dev builds (Windows)
DEV-33209 Linux 1.24.0.120778 client fails to run
DEV-29123 SVC-3871: Crash of viewer when clicking on ghost objects at (0,0,0) on a sim
DEV-35433 Attempting to upload wrong file type crashes viewer
DEV-33499 viewer2009 is not using KDU
DEV-33912 Griefing viewer crashes others' viewers with malformed sound files
DEV-3784 VWR-138: Animation Priority not working correctly, Can't create new AOs
DEV-20678 VWR-9069: Region variable says 'Region Name' in AR if no object is selected
DEV-19934 Help->About Second Life doesn't differentiate between 32- and 64-bit Vista
DEV-6604 Restored folders have 'Purge Item' and 'Restore Item' options
DEV-12867 VWR-5717: Selected Text is not replaced by Input text when Japanese IME is on
DEV-11894 Notecards/Texture windows don't open completely when opened from inventory
DEV-10641 VWR-4955: Local Chat doesn't show end of last conversation
DEV-30039 VWR-12620: Viewer build fails on Linux when compiled with -O2 (--type=Release)
DEV-20944 VWR-9065: (intermittent) Right Click >profile on avatar does not display profile
DEV-24828 Menu accelerator prefixes shouldn't be hard-coded
DEV-34529 VWR-14267: Clicking send in an IM window does not add the sent text to the line editor history
DEV-34124 Invite to group, search by name will not show resident if their first name is two characters
DEV-20930 VWR-9248: On Mac: the "--url" option causes a command line parsing error
DEV-35306 Adult keyword filter triggers multiple warnings
DEV-35503 VWR-3595: "Second Life requires True Color (32-bit) to run in a window" message is incorrect
DEV-35656 VWR-12995: FTBFS: error: format '%-3d' expects type 'int', but argument 3 has type 'size_t'
DEV-30043 VWR-12533: Linux viewer build for OpenAL fails during packaging unless FMOD library is available
DEV-31898 VWR-13202: Right clicking mouse triggers arrow key control events
DEV-32610 Keyboard shortcuts on OSX viewer overridden by OSX
DEV-27067 Coverity Prevent: EVALUATION_ORDER defects
DEV-26188 VWR-2242: Specially formatted .BVH file can cause avatar distortion
DEV-25475 About Land dialog no longer shows Area: field
DEV-19897 OSX Viewer Installer (for an RC) opens with poor positioning
DEV-22837 Inventory> Search Recent Items highlighting incorrect characters
DEV-21709 VWR-9377: Mapping will default to leave exact sim name listing first. (Searching Gar forces Gar to come up and not Garden of Dreams)
DEV-23079 implement volume serial for linux client
DEV-13930 VWR-6432: Space Navigator operation with vehicles is broken
DEV-27666 VWR-10829: Linux Viewer: CLICK_ACTION_PAY shows CLICK_ACTION_PLAY icon
DEV-23670 Viewer crashes on startup if installed into a custom folder with Korean, Japanese or Chinese characters in path
DEV-19313 VWR-8454: PARCEL_FLAG_ALLOW_CREATE_GROUP_OBJECTS not highlighted in script editor
DEV-19918 VWR-8885: Move character/*.xml files to source bundle
DEV-25555 VWR-11172: A source coding mistake prevents number-pad keys from specifying Ctrl+digit shortcuts on Windows
DEV-8536 VWR-4057: Multi-line chat display bug - first character in line missing
DEV-29592 Mac LLFastTimer uses wall clock instead of Intel PMU
DEV-29644 VWR-12587: Cmake install target has a hard coded secondlife-bin reference remaining
DEV-25320 VWR-11128: Python not always detected by develop.py
DEV-30040 VWR-12617: Poor type name that violates Coding Standard breaks compatibility with system header files
DEV-30380 indra/newview/res-sdl/toolpay.BMP is modified during ./develop.py configure
DEV-31247 VWR-12763: non-portable printf specifier used with size_t causes FTBFS on 64bit (due to -Werror)
DEV-29565 VWR-12569: A comment in lluistring.h contains undefined UTF-8 code sequences
DEV-22100 VWR-9620: send_parcel_select_objects in newview/llfloaterland.cpp uses the wrong datatype for the ReturnType field causing a warning
DEV-31911 Selected objects / primitives should be greyed out when nothing is selected
DEV-3667 Windows: Accelerator keys should be "Ctrl+X" rather than "Ctrl-X"
DEV-27223 disable gstreamer on 64-bit linux
DEV-8172 We Need a Linden Sale Option to Sell Land to Anyone
DEV-25511 VWR-10311: Enable LipSync by default
DEV-20443 Revamp group creation confirmation dialog to be more communicative
DEV-20132 VWR-7800: Joystick / SpaceNavigator. Camera should remain in position when exiting flycam mode into avatar mode.
DEV-18420 VWR-8393: Have build scripts copy fmod from an external location
DEV-24841 VWR-10717: Right Space Navigator button should toggle fly in avatar movment, not jump/flyup.
DEV-28457 change auto-populate value in buy L$ window from 1000 to 2000
DEV-15545 VWR-3725: Please add resize option to the SEARCH window UI
2009-10-14 10:40:56 +00:00
536e38ad51
Merging render-pipeline-6-qa-2 into viewer-2
...
Self reviewed.
2009-09-22 11:11:45 +00:00
745845f799
svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
...
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05
Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-27 19:00:18 +00:00
e188badaf2
QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
...
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314
Whew.
2009-02-03 17:56:26 +00:00
446c55538e
svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/
...
merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.
2009-01-13 03:46:56 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
fb793870fe
QAR-1142 merging 1.22 RC0-RC4 changes.
...
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
2008-12-23 19:39:58 +00:00
4a6bacea0f
merge viewer/viewer_1-21 94170-94770 -> release
...
merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
2008-08-28 23:57:41 +00:00
b9b4a4d934
QAR-782 Merge featurettes batch #2
...
merge featurettes-6-merge-2 -> release
dataserver-is-deprecated
2008-08-13 19:37:05 +00:00
Nicky