265bca5d63
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-13 21:18:22 +01:00
04edc15185
SL-16544 Fix for rigged mesh bounding boxes
2022-01-13 17:04:46 +00:00
790ead2ef2
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-541
...
# Conflicts:
# doc/contributions.txt
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llcommon/lltracerecording.h
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2021-11-12 17:43:32 +01:00
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
d06c357bab
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-12 11:02:00 +01:00
8557385707
rationalised changes for stats collection
...
includes additional tracy scopes for testing
most changes are to allow batching stat updates to reduce overhead.
2021-11-03 19:13:12 +00:00
f79890669d
SL-16006 and SL-16009 Rigged mesh rendering optimization pass
2021-09-20 18:58:09 +00:00
d8ec51961f
Merge branch 'DRTVWR-517' of https://bitbucket.org/lindenlab/viewer
2020-12-10 19:40:18 +01:00
c79e648aac
SL-14015 - possible fix for phantom animesh attachments on mac
2020-11-04 16:07:10 +00:00
8b9ed94a35
SL-14183, SL-14142 - impostor management improvements, animesh attachments update on frames when their parent does
2020-10-27 16:04:19 +01:00
dbf00cf036
Merge branch 'master'
2020-04-23 17:40:31 +02:00
4ae15713d2
FIRE-29012: Polymorphism done right...
2020-04-10 12:50:42 +02:00
2a6b48c9b0
DRTVWR-440, merge in latest from 6.3.7 release
2020-01-28 17:26:45 -07:00
da365b227e
Merge Firestorm LGPL
2019-12-13 18:15:19 +01:00
4d2dd72d82
Merge viewer-eep
2019-10-17 01:18:10 +02:00
0cb17cd365
Merge Firestorm LGPL
2019-10-16 23:31:52 +02:00
c7747d2a1b
merge
2019-10-16 22:24:03 +01:00
9f005065d0
Merge Firestorm LGPL
2019-09-10 23:40:54 +02:00
3609eabe54
Merge viewer-release 6.3.2
2019-09-10 12:07:01 -07:00
5c86d6298a
Merge viewer-neko
2019-08-31 14:32:43 +02:00
1bc652075b
SL-10536 Crash in getPosRegionFromAgent
2019-08-29 18:32:42 +03:00
61c56570ab
Merge viewer-eep
2019-08-13 19:05:23 +02:00
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
f05a2fb77c
Merge viewer-bear
2019-07-20 20:40:10 +02:00
8d77d51e63
SL-10908 Safeguards and potential crash fix
2019-07-15 17:56:30 +03:00
e9a9f71e56
SL-10908 Safeguards and potential crash fix
2019-07-15 17:56:30 +03:00
c5c69b2a30
Merge viewer-lynx
2019-06-13 19:48:23 +02:00
f92c1ffdb4
Merge viewer-neko
2019-05-21 20:18:40 +02:00
e54c9987e7
SL-10562 Cleanup 2
2019-05-22 20:41:23 +03:00
2366323483
SL-10562 Cleanup
2019-05-22 20:30:50 +03:00
8101b70999
SL-10562 Children in Animesh linksets can not be selected in some cases
2019-05-20 14:59:05 +03:00
59a12684a0
Merge Firestorm LGPL
2019-01-26 00:05:24 +01:00
b865fc88e5
Fix broken distortion map rendering (was culling everything).
...
Clean up deferred\alpha shader to allow re-entrant graphics switching (link error on 2nd compile/link of deferred shaders).
Clean up some uses of pragma(optimize,...).
2019-01-08 17:20:56 -08:00
74200ffa0c
SL-10285 - removed one possible route for the isImpostor() crash. Intermittent issue.
2019-01-08 21:28:47 +00:00
16a3d569af
SL-10285 - removed one possible route for the isImpostor() crash. Intermittent issue.
2019-01-08 21:28:47 +00:00
949ff8f5c4
Unset mVolumep in LLControlAvatar::markForDeath to hopefully make LLControlAvatar less crash happy.
2019-01-08 21:55:11 +01:00
0109a71d1c
SL-9857 - suppress constraint adjustments immediately after region crossing
2018-10-12 18:53:49 +01:00
b920893fa4
removed unused member variables that make xcode 10 unhappy
2018-10-11 20:43:56 +01:00
3747e3dcc1
SL-9857 - constraint pos math fix
2018-10-11 19:42:29 +01:00
9ad912b601
SL-9849 - animated object attachments get isImpostor() state from av they're attached to
2018-10-10 15:59:22 +01:00
2fc7dcf22f
SL-966 - added scale constraints for animated object attachments
2018-10-03 20:48:57 +01:00
8078b30574
SL-966 - bug fixes, added lerp control for algorithm tweaking
2018-10-03 13:11:50 +01:00
0fd67838cf
SL-966 - tweaks to scale/pos constraint logic
2018-10-03 10:29:11 +01:00
5bb0b393a9
SL-966 - behavior improvements and visualization, bonus removal of unrelated duplicate code in llappviewer.cpp
2018-10-02 22:02:42 +01:00
aacb7eb25f
SL-9773 - treat animated object attachments the same as other rigged attachments for purposes of visibility in mouselook.
2018-10-01 16:11:09 +01:00
4d4255c27b
SL-1350 - keep control avatar rotation synced to corresponding root drawable
2018-09-27 19:34:41 +01:00
963945b3ab
SL-1291 - fixed some issues with selection highlighting of objects rezzed while in build mode. Not clear whether this addresses the original issue, which isn't reproing
2018-09-25 16:39:26 +01:00
e4e4ad3c09
SL-966 - animated object size/pos constraints cont, including some settings for debugging. additional options to anim_tool.py for making test animations
2018-09-10 20:13:35 +01:00
55419ccd43
SL-966 - max size = 64
2018-09-07 13:53:19 +01:00
f8533d1fdb
SL-966 - updated logic for size/pos constraints
2018-09-07 13:48:42 +01:00
Ansariel