41d24952ff
Merge branch 'main' into DRTVWR-539
...
# Conflicts:
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/llfloateravatarrendersettings.cpp
2023-03-31 17:17:21 +03:00
87ecafd7b4
SL-19426 AutoFPS - when enabled always render at least 5 avatars
2023-03-20 20:08:40 +02:00
f9866a3543
Merge branch 'main' into DRTVWR-573-maint-R
...
# Conflicts:
# autobuild.xml
# indra/newview/llagent.cpp
# indra/newview/llimview.cpp
# indra/newview/llimview.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmediasettingsgeneral.cpp
# indra/newview/pipeline.cpp
2023-01-12 04:37:42 +02:00
005b29b89f
SL-18933 FIXED Maximum render time cycles if the Desired framerate is much lower than current framerate
2023-01-11 20:46:28 +02:00
a66ea0a908
SL-12437 Long avatar names should stay as one string
2023-01-10 22:09:47 +02:00
553a98723b
Merge branch 'main' into DRTVWR-539
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llappviewer.cpp
# indra/newview/skins/default/colors.xml
2022-12-13 08:05:03 +02:00
0ee82f5264
SL-18641 fix for 'Always display friends in full detail' setting
2022-11-17 15:04:38 +02:00
717b34f53f
Merge branch 'master' into DRTVWR-539
...
# Conflicts:
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
2022-10-21 14:42:53 +03:00
97b676b60f
Merge branch 'master' into DRTVWR-565-maint-P
2022-10-20 21:43:54 +03:00
dcd74c98dc
SL-18202 impostor too slow avatars and add autotune settings button to Preference
2022-09-27 19:35:49 +03:00
b66f2e7da7
SL-18202 WIP merging autotune contribution and updating UI
2022-09-21 21:19:17 +03:00
85504f085e
Merge branch 'master' into DRTVWR-539
2022-09-21 18:36:49 +03:00
329268c5f7
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# indra/newview/llmodelpreview.h
2022-09-15 20:44:04 +03:00
b5861e58cb
Merge branch 'master' into DRTVWR-565-maint-P
2022-09-15 20:43:02 +03:00
43a9b3e4e4
SL-17990 Give user a popup warning when they attach a rigged mesh object to an HUD
2022-08-19 20:19:23 +03:00
856d2a44d1
Merge branch 'master' into DRTVWR-539
2022-08-04 11:16:54 +03:00
59ab8e78f4
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llpanelobject.cpp
2022-08-04 00:17:55 +03:00
ea26ee5e92
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llvovolume.cpp
2022-08-04 00:15:36 +03:00
dfc1175546
Merge branch 'master' into DRTVWR-565-maint-P
2022-08-04 00:12:26 +03:00
e9ac774ceb
SL-17473 Viewer not clearing all Vertex Buffers in some cases
...
Image thread doesn't need mBuffer and buffer isn't thread safe so no point allocating it in an image thread.
2022-07-15 22:53:59 +03:00
b6e8596cd9
SL-16598 Stuck in Ground Sit
...
'Sitting' motion was in a loading state, but not active, which resulted in viewer dropping 'sitting' state
2022-07-07 22:59:49 +03:00
9b0569840f
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
2022-05-31 01:58:09 +03:00
4cfa59d3f1
SL-17473 Viewer not clearing all Vertex Buffers in some cases
...
Image thread doesn't need mBuffer and buffer isn't thread safe so no point allocating it in an image thread.
2022-05-26 22:43:12 +03:00
386e050480
Merge branch 'master' into DRTVWR-539
2022-05-26 14:01:55 +03:00
91606c7b60
Merge branch 'master' into DRTVWR-548-maint-N
2022-05-26 03:07:05 +03:00
bf183ecff7
SL-17449 Fix for Alexa's hair
2022-05-18 17:56:54 -05:00
307db06310
SL-10163 - allow joint aliases in animation uploads. Names are canonicalized before sending to simulator.
...
# Conflicts:
# indra/newview/llviewerassetupload.cpp
# indra/newview/llvoavatar.cpp
# scripts/content_tools/anim_tool.py
2022-05-18 23:30:02 +03:00
4413f9be87
SL-288, SL-10163 - error reporting for animation upload failures.
2022-05-18 23:26:01 +03:00
f7edcab9c3
SL-288, SL-10163 - allow joint aliases, but otherwise reject upload of animations containing invalid joint names
...
# Conflicts:
# indra/newview/llviewerassetupload.cpp
# indra/newview/llvoavatar.cpp
2022-05-18 23:25:51 +03:00
c6fe446c3a
SL-17415 Movement of scripted attached objects is no longer interpolated.
2022-05-17 00:15:32 +03:00
d2e242ab63
SL-17412 Crash at isWearingWearableType
...
Related to "Allow Select Avatar" feature, selection manager made avatar to persist longer.
2022-05-16 18:28:06 +03:00
28ae135375
SL-16746 Hide hair and fix missing light for animation preview
2022-05-14 01:11:08 +03:00
10e8ea5ff8
Merge branch 'DRTVWR-546' into DRTVWR-539
2022-05-05 14:06:30 +03:00
ac0c9a7412
SL-16721 Crash at LLVOAvatar::idleUpdateMisc
2022-04-28 23:06:56 +03:00
9e35292420
merge fix
2022-04-26 16:10:52 +03:00
79c9a8a4b7
Merge branch 'DRTVWR-546' into DRTVWR-539
2022-04-26 16:03:03 +03:00
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
026ad511ea
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersearch.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llvovolume.cpp
2022-04-18 20:43:49 +03:00
fe2f9aed25
SL-16721 Crash on idleUpdateMisc #2
2022-03-07 19:39:13 +02:00
f90d179058
Merge branch 'DRTVWR-546' into DRTVWR-539
...
# Conflicts:
# indra/llcommon/tests/llprocess_test.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llcombobox.h
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
2022-03-02 19:46:48 +02:00
4e31ff1d7e
SL-16056 Load cloud texture only once
2022-02-21 23:11:17 +02:00
8c64cc63cd
Merged in SL-98 (pull request #864 )
...
SL-98 - Render a "ground plane" in the model upload preview, so users can see any added offset
Approved-by: Andrey Kleshchev
Approved-by: Andrey Lihatskiy
2022-02-08 23:09:00 +00:00
b146de38de
SL-98 - Remove dead code
2022-02-08 14:59:31 -08:00
f1df486208
SL-98 - move new renderGroundPlane from LLVOAvatar to LLModelPreview
2022-02-04 13:55:08 -08:00
3397ca1476
SL-98 - Guessing at what might make MS compiler happier.
2022-02-04 12:46:22 -08:00
57a7f63dcc
SL-98 - Render a "ground plane" in the model upload preview, so users can see any added offset
2022-02-04 09:55:05 -08:00
af830e5fc5
SL-16721 Crash at LLVOAvatar::idleUpdateMisc
...
bridge in state 24 (dead)
2022-01-28 00:32:33 +02:00
3dd841277e
SL-16056 Avatar gas cloud adaptive delay #2
...
Reset avatar 'loaded' timer after getting new mesh data
2022-01-27 00:32:24 +02:00
345733173f
SL-16594 Fix for occasional single-frame culling of rigged attachments
2022-01-24 14:54:52 -06:00
5b04123aec
Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into DRTVWR-539
...
# Conflicts:
# indra/llcommon/lltracerecording.h
# indra/newview/llfloaterpreference.cpp
2022-01-21 10:33:37 -06:00
Mnikolenko Productengine