Oz Linden
c20e57c48f
move debugging globals to the "lowest" library they are referenced in
2016-12-20 14:41:46 -05:00
Nat Goodspeed
05d58c91ef
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2016-12-05 17:01:38 -05:00
AndreyL ProductEngine
2abd0eef41
Merged in lindenlab/viewer-release
...
DRTVWR-412 Bento (avatar skeleton extensions)
2016-12-05 21:51:29 +02:00
Brad Payne (Vir Linden)
93db7eacbd
SL-540 - fix for regression in handling of out-of-range joint indices in skin weights
2016-11-30 14:03:54 -05:00
Nat Goodspeed
f5e9839627
DRTVWR-418: Replace preprocessor tests for Windows-specific _M_AMD64
...
with tests on ADDRESS_SIZE, which is now set on the compiler command line.
2016-11-16 15:39:00 -05:00
Nat Goodspeed
934b94e74a
DRTVWR-418: pull in new viewer-release via viewer64
2016-11-16 10:56:05 -05:00
Brad Payne (Vir Linden)
d31596db6a
merge
2016-11-16 08:39:41 -05:00
Brad Payne (Vir Linden)
8230a9937f
MAINT-6841 - removed the joint remapping code, since it was designed to support a feature we no longer have. This also incidentally fixes any bugs caused by the joint remapping code.
2016-10-18 16:05:35 -04:00
Brad Payne (Vir Linden)
8d6bb9ee4e
SL-451 - SSE-optimized matrix multiply, used in initSkinningMatrixPalette()
2016-09-28 15:43:07 -04:00
andreykproductengine
21fdf0485f
MAINT-6747 eliminating convertion error
2016-09-23 19:45:58 +03:00
Brad Payne (Vir Linden)
f9be47d669
SL-274 - disabled test w/non-SSE matrix ops. MAINT-6672 - fixed Reset Skeleton, no longer crashes.
2016-08-23 17:08:57 -04:00
Brad Payne (Vir Linden)
278825191b
TEST - non-SSE code path for matrix ops used in mesh skinning.
2016-08-23 15:08:14 -04:00
andreykproductengine
c86ab13b6b
MAINT-612 FIXED LOD switch distance calculation ignores z-axis scale
2016-07-27 20:33:04 +03:00
Brad Payne (Vir Linden)
bd09297b8e
SL-220 - handle case that a weighted vertex includes no skin weights
2016-06-03 08:08:41 -04: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)
2d8b53854e
merge
2016-05-06 11:00:47 -04:00
Oz Linden
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
Nicky
944c497090
Code stylistics.
...
(transplanted from 570ea799407270069974021eca3a5056d6908f58)
2016-04-24 12:55:50 +02:00
Nicky
e8aa2dd71f
x64: Do not use a union of LLColor4U. Especially having the two pointer in there will blow up the struct to at least 8 byte, which will break VBO packing as this class needs to be 4 byte in size.
...
(transplanted from 847df86d6b5daa69dcfc428df18876a9c1e8bef6)
2016-04-22 14:58:25 +02:00
Nicky
7640c2fb44
Windows x64: Cannot use inline assembly.
...
(transplanted from 0b621f8a1ee707527325eb70e59ef02c63e2bd10)
2016-04-22 12:59:59 +02:00
Nicky
637dc1f5a9
Windows x64: 64 bit implies SSE2, handle this accordingly when detecting if SSE2 is enabled.
...
(transplanted from 93492b84cb752dc79c74d9667f11edd76ace8f0b)
2016-04-22 12:59:41 +02:00
Brad Payne (Vir Linden)
b138ca8aee
SL-366 - more cases where skinned weights can go awry, and a bunch more asserts to verify.
2016-04-06 16:12:39 -04:00
Mnikolenko ProductEngine
b737630f6a
MAINT-6274 FIXED Mouse pointer incorrectly appears on the edge of the screen after dragging World map
2016-04-01 14:31:46 +03:00
Brad Payne (Vir Linden)
ba1e3e4f86
SL-352 - another case where legacy content revealed a bug in weight remapping.
2016-03-31 10:53:26 -04:00
Oz Linden
5822fb00b6
merge DRTVWR-398 build cleanup fixes
2016-03-07 12:41:11 -05:00
Oz Linden
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
Brad Payne (Vir Linden)
6c6a95478e
SL-234 WIP - remap skin weights to match included-joint logic
2015-10-19 16:32:49 -04:00
Oz Linden
69ff937e47
merge changes for 3.8.5-release
2015-10-13 08:43:03 -04:00
AndreyL ProductEngine
f64a10ca8f
Merge downstream code, version 3.8.5
2015-09-30 01:21:04 +03:00
Oz Linden
9757c3a7fa
merge changes for 3.8.4-release
2015-09-29 15:24:03 -04:00
Oz Linden
398ec2fdfc
add comments for MAINT-5660 asserts
2015-09-23 16:21:31 -04:00
Brad Payne (Vir Linden)
ec0804a5f7
merge
2015-09-14 17:35:28 -04:00
Brad Payne (Vir Linden)
6b2c1d5f10
SL-133 WIP, SL-134 WIP - more extra joint handling
2015-09-14 11:01:22 -04:00
andreykproductengine
bb7ac16318
MAINT-5532 FIXED upload of duck.dae from MAINT-4483 crashes mac viewer
2015-08-20 20:25:58 +03:00
Oz Linden
71a468c6fb
merge changes for other open sourc contributions
2015-07-30 11:09:00 -04: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
andreykproductengine
5f397bdd18
Merge from viewer-release
2015-04-29 15:28:21 +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
andreykproductengine
1dd7e76908
Merge with viewer-release and become 3.7.28
2015-04-14 18:53:17 +03:00
Oz Linden
a8ef252571
merge changes for 3.7.27-release
2015-04-13 16:23:36 -04:00
Oz Linden
6f3cf79a3a
merge changes for 3.7.24-release
2015-01-13 13:46:45 -05:00
simon
10390bc470
Fix merge error
2015-02-20 09:22:11 -08:00
simon
c5f281913e
Merge downstream code
2015-02-19 17:22:13 -08:00
ruslantproductengine
96e5fc9f9b
MAINT-4329 Backed out changeset: fd3a4d5c2cf5
2015-02-14 00:08:39 +02:00
Oz Linden
4f49b3c3dd
merge changes for STORM-2083
2015-01-06 11:03:49 -05:00
maksymsproductengine
7869b9a73d
merge changes of 3.7.23-release
2014-12-19 23:18:21 +02:00
callum_linden
4c597c548f
Fix up remaining llround() -> ll_round() issues
2014-12-12 11:03:56 -08:00
Nat Goodspeed
ddf0f7a915
Another round of ll_round()
2014-12-12 08:54:34 -08:00
Nat Goodspeed
115cd1d4e6
Fix a couple more ll_round() calls
2014-12-11 13:30:25 -08: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
callum_linden
78a75ca00f
Cinder pointed out my fix here for clang pickiness was different from hers so I investigated and this is the causes of the slowdown - wrongly placed parens
2014-11-14 14:52:12 -08:00
callum_linden
ee5463a903
Reworked changes to more closely match Cinders' - hers seem more correct
2014-11-14 14:50:50 -08:00
Ansariel
8078ffffc2
STORM-2083: LLCalcParser calculates inverse trigonometric functions wrong
2014-11-07 20:06:47 +01:00
ruslantproductengine
799d13269a
MAINT-3585 FIXED Viewer Crashes when attempting to upload image.
...
The bug was fixed, the reasone of crash is following. The Core Flow view
contain another GL context and will not care about restoring a previous.
I restore context manually.
This path also contain a minor changes in another files.
All changes described here.
Сhange's for fix current bug.
indra/llwindow/llwindow.h
indra/llwindow/llwindowheadless.h
indra/llwindow/llwindowmacosx.h
indra/llwindow/llwindowsdl.h
indra/llwindow/llwindowwin32.h
indra/newview/lllocalbitmaps.cpp
indra/newview/llviewerdisplay.cpp
indra/newview/llviewerdisplay.h
Twice mUsage initialization (replace to forward initialization).
indra/llcharacter/lljointstate.h
Looks like condition should be befor memcopy call, otherwise - possible CRASH.
indra/llcommon/llmd5.cpp
Unused condition and variables.
indra/llmath/llsphere.cpp
Looks like should be under if otherwise - possible CRASH
indra\llprimitive\llmodel.cpp
Useless assert's.
indra/llrender/llrender.cpp
indra/newview/lldaycyclemanager.cpp
2014-11-03 20:05:20 +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
07fd457e13
Update to build on Xcode 6.0: various scoping issues with octree code
2014-10-17 14:31:54 -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
callum_linden
8db1250b73
Update to build on Xcode 6.0: collection of similar const var not used warnings/errors [-Wunused-const-variable]
2014-10-17 14:08:58 -07:00
ruslantproductengine
41170b5603
MAINT-4329 FIXED scales each image *twice* for no apparent reason : patchset #2
2014-09-25 21:19:17 +03:00
ruslantproductengine
a4fc0b26b0
MAINT-3511 FIXED When one surface of mesh object is set transparent all object is invisible : compare rotation quaternions with predefined epsilon
2014-08-18 15:12:16 +03:00
Graham Linden
db43a0560c
Merge viewer-release
2014-07-31 08:40:57 -07:00
Graham Linden
76e7f978c1
Merge viewer up to 3.7.12, including fixing missed LL_WARNS etc from last release (is that trout you smell on the air? is it?)
2014-07-07 17:59:07 -07:00
simon
3e6698073c
Merge viewer-release and become version 3.7.12
2014-07-07 14:49:45 -07:00
Graham Linden
a815ad481a
Mergeup to 3.7.9 viewer-release
2014-05-29 04:54:58 -07:00
simon
dc4c184696
Merge downstream version 3.7.8 code
2014-05-07 13:19:05 -07:00
simon
250db74bf9
Pull and merge viewer-release as version 3.7.8
2014-05-07 10:56:41 -07:00
Oz Linden
a98b4b6bee
merge changes for 3.7.7-release
2014-05-07 11:09:04 -04:00
Graham Linden
5cbcff7b40
Appease GCC 4.6.1 syntax problems with uintptr_t in alignment asserts
2014-04-22 22:19:39 -07:00
Oz Linden
6c8bddca3d
merge changes for STORM-1915
2014-04-22 16:01:45 -04:00
Graham Linden
ae035a0d66
Modify importer to (optionally) improve debug output, perform name-based LOD association, and handle models with many materials.
2014-04-22 08:58:38 -07:00
Oz Linden
a373a7442c
merge changes for 3.7.2-release
2014-03-04 13:15:43 -05:00
Oz Linden
413d29d3ee
merge changes for bug-1044
2014-03-04 11:22:19 -05:00
Ricky Curtice
3e09cdefff
Fixed compile-time errors. My bad.
...
Serves me right for not waiting through the compile!
2014-03-02 22:06:24 -08:00
Ricky Curtice
e0a015920d
STORM-1920: Richard fixed and optimized a ton more math.
...
From Richard: There are a bunch of things I changed...mainly I eliminated all the grid_offset nonsense and instead simply calculate the tick index for the current drag position and use that to generate a snapped position as needed. I still use approx_equal because I want grid numbers to light up even when they aren't the axis you are currently snapping to.
2014-03-02 14:33:57 -08:00
Dave Parks
7835d48f6d
Automated merge with https://bitbucket.org/lindenlab/viewer-lion
2014-02-27 18:06:48 -06:00
Richard Linden
0b9eeb02ab
MAINT-2059 FIX Corner scaling doesn't highlight distance text
...
much cleanup of vector math
also made Stretch Both Sides checkbox clickable via label
2014-02-24 18:36:13 -08:00
Ricky Curtice
a060dcfff7
STORM-1920: Math cleanup from Richard Linden.
2014-02-18 23:03:13 -08:00
Richard Linden
a347267cf1
cleaned up llmanipscale logic for readability...no change in functionality
2014-02-13 15:35:21 -08:00
Dave Parks
bfe520387e
MAINT-2876 Fix for freeze when editing certain rigged meshes at high altitude.
2014-02-13 17:03:36 -06:00
Richard Linden
5866bb7ef0
merge with release
2014-02-12 10:32:02 -08:00
Xiaohong Bao
e2d14cfd47
fix crash at line 2207: llassert(dst->isFinite3()) in llvolume.cpp
2014-02-04 21:32:11 -07:00
Xiaohong Bao
6a0a5c18e3
more fix for SH-4607: Create new object cache tuning parameters
...
fix remote objects not showing up.
2013-11-13 22:38:19 -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
Xiaohong Bao
9053b9020a
fix for SH-4521: Interesting viewer crash in Pipeline:RenderDrawPools
2013-09-26 11:03:04 -06: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
Oz Linden
493a34aa15
merge changes for storm-1915
2013-09-11 11:27:56 -04:00
Dave Parks
cacefaf2fc
MAINT-2811 Fix for infinite loop on octree code during teleport.
2013-08-30 15:55:20 -05:00
Xiaohong Bao
d8c02bf062
Merge
2013-08-19 16:09:28 -06:00