Ansariel
b8b0c8ec3b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-04-19 15:42:14 +02:00
Andrey Kleshchev
ce4c694b66
Merge branch master (D540) into DRTVWR-546
...
# Conflicts:
# indra/llcommon/llsdutil.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolwater.cpp
2022-04-18 23:42:39 +03:00
Ansariel
ef88337eef
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-02 10:12:19 +01:00
Andrey Kleshchev
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
Ansariel
25f974d77d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 10:00:36 +01:00
Andrey Lihatskiy
73eec89131
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llfloatereditextdaycycle.cpp
2022-02-28 21:54:21 +02:00
Ansariel
e7bc3f3a5a
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-02-16 10:54:59 +01:00
Dave Parks
f47730b92c
SL-16418 Media texture update stall fix. Make media texture updates use LLImageGL thread to update, fix AMD sync issue on ImageGL thread and install debug callbacks on LLImageGL thread when debug gl enabled.
2022-02-14 18:07:24 +00:00
Ansariel
0a0e2fe93e
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-15 02:39:07 +01:00
Ptolemy
a71f772cc3
SL-16606: Add profiler category VOLUME
2022-01-14 11:50:21 -08:00
Ansariel
95db09d8d0
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-530
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:31:49 +01:00
Andrey Lihatskiy
469ce7f7f6
Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK
...
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:51:52 +02:00
Ansariel
2ba4a164e2
Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Python.cmake
# indra/lib/python/indra/util/llmanifest.py
# indra/lib/python/indra/util/test_win32_manifest.py
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcommon/llerror.cpp
# indra/newview/llappviewer.cpp
# indra/newview/lleventnotifier.cpp
# indra/newview/llpanellandmarks.cpp
# indra/newview/llpreviewanim.cpp
# indra/newview/llpreviewanim.h
# indra/newview/llviewerregion.cpp
# indra/newview/skins/default/xui/de/menu_place_add_button.xml
# indra/newview/skins/default/xui/it/menu_place_add_button.xml
# indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
# indra/newview/skins/default/xui/ja/menu_place_add_button.xml
# indra/newview/skins/default/xui/pl/menu_place_add_button.xml
# indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
# indra/newview/skins/default/xui/ru/menu_place_add_button.xml
# indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
# indra/newview/viewer_manifest.py
2021-12-16 12:32:34 +01:00
Ansariel
ea9aa51dfe
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-542
2021-11-30 08:43:46 +01:00
Ansariel
d2e5a9b1fe
Merge branch 'DRTVWR-542-meshopt' of https://bitbucket.org/lindenlab/viewer
2021-11-30 00:37:46 +01:00
Andrey Kleshchev
27e4e245d9
Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546
2021-11-29 20:33:13 +02:00
Andrey Kleshchev
a1349c14dd
SL-16413 Handle out of memory llface allocations
2021-11-25 00:00:29 +02:00
Ansariel
addec75adc
Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer
2021-11-19 09:41:22 +01:00
Andrey Kleshchev
bfcb1f61a8
SL-16263 RaiseException in LLVolumeFace::createSide
2021-10-28 01:27:18 +03:00
Ansariel
7bef9a1605
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-10-12 13:34:36 +02:00
Beq
0911cae538
Initial merge of DRTVWR-541 into FS
...
Fixup a few niggly mistakes from the LL work
Add a couple of missing macros
replace all FS tracy macros with the corresponding LL ones.
2021-10-09 20:18:14 +01:00
Andrey Kleshchev
fea2d7bacc
SL-16152 _Allocate failed
2021-10-08 01:32:48 +03:00
Ptolemy
8e4907beee
SL-16014: Add Tracy markup for LLVolumeFace
2021-09-22 14:38:43 -07:00
Andrey Kleshchev
8e725e74aa
DRTVWR-542 Attempt to simplify all faces of an object as a whole and split back into faces #2
2021-07-26 21:20:53 +03:00
Beq
a38e971f8d
Updates for non-allocating llsd changes (via Rye)
2021-06-13 12:37:29 +01:00
Andrey Kleshchev
e5cbf1607a
SL-14119 Crash at LLVolumeFace::cacheOptimize
2020-10-14 22:19:54 +02:00
Andrey Kleshchev
8a64ded50f
SL-14119 Crash at LLVolumeFace::cacheOptimize
2020-10-14 11:48:07 +03:00
Ansariel
a0bcb42352
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-04-30 14:11:34 +02:00
Nicky
99a50b2bb5
Linux; FIRE-29492: completely disable cacheOptimize again.
2020-04-27 13:32:14 +02:00
Andrey Lihatskiy
c757c29c95
Merge branch 'master' into DRTVWR-500
...
# Conflicts:
# indra/newview/pipeline.cpp
2020-04-20 21:23:34 +03:00
Dave Houlton
f61a5c4642
Merge viewer-release 6.3.6 into viewwer-eep repo
2019-12-16 12:47:19 -07:00
Ansariel
da365b227e
Merge Firestorm LGPL
2019-12-13 18:15:19 +01:00
Ansariel
797fa6718b
Merge 494-maint-wassail
2019-11-28 17:09:26 +01:00
AndreyL ProductEngine
bc496f5f17
Downstream merge from lindenlab/viewer-lynx
2019-11-27 22:58:52 +02:00
andreykproductengine
3d88b2587d
SL-12322 addTriangle crash
2019-11-21 17:49:03 +02:00
Ansariel
6e340961c0
Merge viewer-neko
2019-10-30 18:05:01 +01:00
andreykproductengine
1b4d5492c6
SL-11727 Fix build warnings
2019-10-23 16:37:15 +03:00
Ansariel
6fa34eff70
Merge Firestorm LGPL
2019-10-14 18:06:42 +02:00
Nicky
84d7c832cb
Make indices 32 bit to avoid overflows.
2019-10-13 18:50:32 +02:00
Nicky
f3855085f5
FIRE-23370 / Linux; cache optimize volume faces again without destroying the triangle mesh.
2019-10-12 06:59:39 +02:00
Ansariel
af5779a8fa
Merge Firestorm LGPL
2019-08-14 17:37:18 +02:00
Ansariel
61c56570ab
Merge viewer-eep
2019-08-13 19:05:23 +02:00
Graham Linden
71af0a2a9e
Fix shutdown crash in teardown of joint heirarchy.
...
Ifdef'd code for potential skinning speed up to avoid lots of int<->float conversions (expensive and static for min space investment)
as updating rigged VBs shows up as a profiling bottleneck for Low rendering (where we actually use CPU skinning).
2019-08-06 14:41:55 -07:00
Graham Linden
76128c4357
SL-10566 Use vector for some high-traffic, low-item count containers instead of list.
...
Provide method of storing joint indices sep from weight data for faster runtime processing.
2019-08-05 12:04:29 -07:00
Nicky
d9888f07f3
FIRE-23370/BUG-8801/MAIN-5060/Linux; (For now) disable LLVolumeFace::cacheOptimize as it can destroy the triangle definition of a meshes.
2019-07-23 16:20:34 +02:00
Ansariel
637a4f0956
Merge Firestorm LGPL
2019-04-03 20:39:01 +02:00
Graham Linden
d78ed764b5
Merge 6.1.2 LoveMeRender new hotness
2019-04-02 12:27:34 -07:00
Ansariel
7fdc689a85
Merge viewer-eep
2019-03-21 20:54:50 +01:00
Graham Linden
898c9f4421
Mods to make merge with viewer-release have less whitespace-only change and fix diffs between EEP and VR.
2019-03-13 13:21:48 -07:00
Ansariel
9735854226
Merge Firestorm LGPL
2018-11-16 18:10:32 +01:00
Ansariel
62e77ba1b2
Merge Firestorm LGPL
2018-11-15 21:24:16 +01:00
AndreyL ProductEngine
c21396181b
Merged in lindenlab/viewer-release
2018-11-14 22:47:31 +02:00
Rider Linden
1d022e86c8
Merge
2018-11-14 11:19:33 -08:00
Ansariel
1733550573
Merge viewer-eep
2018-09-22 00:42:04 +02:00
Ansariel
d2963a5e60
Merge viewer-cougar
2018-07-11 20:48:32 +02:00
Graham Linden
0aa2e5b1a3
Replace cache hit info in tex fetch debug display.
...
Silence launcher warning for devs.
Work-around path gen deciding to gen NaNs for some flexi prims.
2018-06-28 19:30:19 +01:00
Ansariel
c1f3b20f55
Merge axon
2018-06-20 19:07:46 +02:00
Brad Payne (Vir Linden)
edf6795eda
SL-915, MAINT-8554 - cleanup/reorg, added encroachment fix info to DebugAnimatedObjects output
2018-06-13 21:49:24 +01:00
Brad Payne (Vir Linden)
430f9420cf
SL-915 - more on dynamic extent tracking, possible fix for 32-bit crash issues
2018-06-07 22:18:15 +01:00
Ansariel
5560f13b4b
Merge axon
2018-06-07 19:15:42 +02:00
Brad Payne (Vir Linden)
2a2046fd07
merge
2018-06-05 22:44:04 +01:00
Brad Payne (Vir Linden)
3fcf7a32ee
SL-915 - incremental updates to dynamic bounding box, setting to control detail.
2018-06-05 15:35:21 +01:00
Ansariel
acfe7e625e
Merge Firestorm LGPL
2018-06-01 22:10:21 +02:00
Graham Linden
37e8fd20c3
Merge to 5.1.6
2018-06-01 15:34:21 +01:00
Graham Linden graham@lindenlab.com
439273c9c1
Merge
2018-05-23 01:16:12 +01:00
Ansariel
d799bec7d8
Merge Firestorm LGPL
2018-05-18 14:46:58 +02:00
Ansariel
3f331bb24c
Merge Firestorm LGPL
2018-05-18 10:32:56 +02:00
AndreyL ProductEngine
64b3473f49
Merged in lindenlab/viewer-release
2018-05-18 03:02:44 +03:00
Graham Linden graham@lindenlab.com
0d7fa932d5
Move class3 sky/cloud shaders to where they need to be to get picked up by ALM.
...
Modify autobuild.xml to use new libatmo w/ state save/restore fixes (addresses font render glitch).
Put in nSight debug support.
2018-04-20 18:14:29 +01:00
Brad Payne (Vir Linden)
7a006ea3a2
merge
2018-05-18 18:40:36 +01:00
Ansariel
5d924483a8
Merge viewer-cougar
2018-03-02 15:00:48 +01:00
Brad Payne (Vir Linden)
9f8c6ace4a
merge
2018-03-02 13:00:18 +00:00
Ansariel
c8e654c61d
Merge axon
2018-03-02 11:04:21 +01:00
Ansariel
9948fe9cc6
Merge Firestorm LGPL
2018-03-02 11:01:50 +01:00
AndreyL ProductEngine
af9069edbf
Merged in lindenlab/viewer-release
2018-03-02 00:47:08 +02:00
Brad Payne (Vir Linden)
3f9b3e01b9
MAINT-8264 - prevent at least some cases of LODs getting stuck at too-low values.
2018-02-21 22:02:34 +00:00
Ansariel
999163b3f5
Merge viewer-neko
2018-02-12 21:45:05 +01:00
Ansariel
ec33358c85
Merge viewer-bear
2018-02-12 21:33:11 +01:00
andreykproductengine
0d40ac2ed9
MAINT-8258 Don't show sculpty until it is loaded or load fails
2018-02-07 20:41:53 +02:00
andreykproductengine
3b4ae3fe52
MAINT-8269 Crahes in cacheOptimize()
2018-02-05 16:52:13 +02:00
andreykproductengine
bdc9a93bc9
MAINT-8269 Crahes in cacheOptimize()
2018-02-05 16:52:13 +02:00
Ansariel
89e753a81d
Merge Firestorm LGPL
2018-01-17 21:20:40 +01:00
Brad Payne (Vir Linden)
e36745eb98
merge
2018-01-17 16:06:27 +00:00
Ansariel
0b6176dea9
Merge Firestorm LGPL
2018-01-25 21:57:38 +01:00
Ansariel
f727126c95
Merge viewer-bear
2018-01-25 21:55:38 +01:00
Ansariel
f6e3684f6e
Merge Firestorm LGPL
2018-01-17 12:07:54 +01:00
AndreyL ProductEngine
57a99273ed
Merged in lindenlab/viewer-release
2018-01-17 03:20:12 +02:00
Ansariel
98569f84a2
Merge viewer-neko
2018-01-13 19:11:09 +01:00
andreykproductengine
c56298d4ba
MAINT-8022 Make unzip silent yet include failure reason into output
2018-01-03 16:30:57 +02:00
Ansariel
e7715f7a31
Merge Firestorm LGPL
2017-11-30 20:33:07 +01:00
Brad Payne (Vir Linden)
5c7f27562d
merge
2017-11-29 23:40:12 +00:00
Ansariel
d1f365d81d
Merge Firestorm LGPL
2017-11-29 23:43:03 +01:00
Nat Goodspeed
e3a2c5e321
DRTVWR-418: Merge from latest viewer-release
2017-11-29 14:47:09 -05:00
Ansariel
c606bc3492
Merge viewer-lynx
2017-11-12 12:28:28 +01:00
Ansariel
8821f554e5
Undo crash fix in LLProfile destructor for upcoming fix from LL
2017-11-07 11:23:54 +01:00
andreykproductengine
fec6bbddc3
MAINT-7974 Fixed LLProfile crash(error) caused by thread unsafe variable
2017-11-03 20:30:47 +02:00
Nat Goodspeed
0c7bc67814
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-10-11 14:35:49 -04:00
Ansariel
13ea9a242a
Merge Firestorm LGPL
2017-10-11 20:30:12 +02:00
Ansariel
06db7c626f
Merge Firestorm LGPL
2017-10-11 17:58:16 +02:00
Brad Payne (Vir Linden)
299592e88e
merge
2017-10-11 14:16:39 +01:00
Ansariel
01d8e7e347
Merge axon
2017-09-20 01:09:14 +02:00
Ansariel
615336a4d4
Merge viewer-neko
2017-09-07 21:49:12 +02:00
Brad Payne (Vir Linden)
a571707243
SL-731 - render metadata includes triangle count, triangle and vertex count included with debug text for control avatar
2017-08-03 14:23:02 +01:00
andreykproductengine
58cea615c5
MAINT-7649 Error with information in case of failed allocation.
2017-09-01 17:06:25 +03:00
Nicky
03e7dc1a6f
Merge with fs-lgpl.
2017-04-04 16:25:22 +02:00
Nicky
e19d7a7490
Merge with viewer64.
2017-02-14 19:49:51 +01:00
Ansariel
e8d4094d90
Merge viewer-bear
2017-02-03 20:09:53 +01:00
ruslantproductengine
6770c27321
MAINT-6645 - Improvement - Agents that render as jelly dolls should have their attachments render at 0 LoD to prevent loading higher LoD complexity in memory thus deterring crashes.
...
Comments:
- Fix based on "RenderAutoMuteByteLimit" setting.
- File indra/llxml/llcontrol.h - add all signals to 0 group.
It garanty that handlers (in indra/newview/llviewercontrol.cpp) will be called last.
2017-01-24 15:56:25 +02:00
andreykproductengine
ce2cbdc4b5
MAINT-309 Fixed top and bottom cube faces do not show a selection silhouette
2017-01-25 21:59:47 +02:00
Oz Linden
c20e57c48f
move debugging globals to the "lowest" library they are referenced in
2016-12-20 14:41:46 -05:00
Ansariel
eb06fba767
Merge bento-box
2016-11-30 21:03:16 +01: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
Ansariel
5a58635b64
Merge Firestorm LGPL
2016-11-16 16:11:56 +01:00
Brad Payne (Vir Linden)
d31596db6a
merge
2016-11-16 08:39:41 -05:00
Nat Goodspeed
1771857e6c
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-03-06 14:27:29 -05:00
Ansariel
a0c253bb78
Merge bento-box
2016-10-19 00:16:24 +02: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
Ansariel
b18cee4f33
Merge viewer-bear
2016-08-11 21:48:43 +02:00
andreykproductengine
c86ab13b6b
MAINT-612 FIXED LOD switch distance calculation ignores z-axis scale
2016-07-27 20:33:04 +03:00
Ansariel
88b928e1dd
Merge bento-box
2016-06-16 00:53:56 +02: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
Ansariel
919521d121
Merge Firestorm LGPL tip
2016-05-21 19:02:00 +02:00
Brad Payne (Vir Linden)
f47ceb47bb
merged jelly-doll viewer-release into bento
2016-05-21 08:15:28 -04:00
Ansariel
472215b46c
Merge bento-box
2016-04-14 14:29:20 +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
Ansariel
8144c54661
Merge bento-box
2016-03-31 18:46:06 +02: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
Ansariel
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
Oz Linden
5822fb00b6
merge DRTVWR-398 build cleanup fixes
2016-03-07 12:41:11 -05:00
Ansariel
824a1b359e
Merge Firestorm LGPL tip
2016-02-13 16:29:21 +01:00
Ansariel
62bfd564cd
Merge Firestorm LGPL
2016-01-27 09:52:12 +01:00
Nicky
2c3e64c2d4
Backout c52eba2ff63d
2016-01-16 19:39:21 +01:00
Ansariel
be6ce75a96
Merge bento-box
2015-12-17 11:47:42 +01:00
Ansariel
4144783a64
Merge Firestorm LGPL tip
2015-11-21 17:39:28 +01:00
Nicky
c3ad1c803e
FIRE-17341 / BUG-10747 do allow weights of zero, or some rigged mesh will display broken.
2015-11-20 22:07:28 +01: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
Ansariel
83862ed91a
Merge Firestorm tip
2015-10-15 11:02:30 +02:00
Oz Linden
69ff937e47
merge changes for 3.8.5-release
2015-10-13 08:43:03 -04:00
Ansariel
5524d38dff
Merge viewer-quickgraphics
2015-10-03 16:38:26 +02:00
Ansariel
2be388c7e0
Merge Firestorm LGPL
2015-09-30 10:41:43 +02: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
Ansariel
b9746dde29
Merge viewer-bear
2015-09-15 01:39:31 +02: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
Ansariel
e861273da8
Merge viewer-loader-mods
2015-08-29 14:14:08 +02:00
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