a7c9ca8960
Merge branch 'master' into DRTVWR-561-maint-O
2022-06-29 20:32:13 +03:00
77ce594dec
Merge branch 'master' into DRTVWR-544-maint
2022-06-29 20:31:17 +03:00
b1a5a5c64d
Merge branch 'DRTVWR-483' of https://bitbucket.org/lindenlab/viewer
2022-06-29 18:23:43 +02:00
1fbfe48f84
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
2022-06-29 18:23:17 +02:00
1b369c7f10
Merge branch 'master' (DRTVWR-543) into DRTVWR-483
...
# Conflicts:
# indra/newview/llviewertexturelist.cpp
2022-06-29 18:30:05 +03:00
3a4a0bd3d2
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-06-29 17:25:32 +02:00
bd414ee0d0
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
2022-06-29 17:21:22 +02:00
1e4f2ec07e
Increment viewer version to 6.6.2
...
following promotion of DRTVWR-543
2022-06-29 11:01:34 -04:00
de2679705a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-06-28 08:57:07 +02:00
c49fa9a892
FIRE-31330: Don't show for scripted content that temp-attaches a rigged mesh (e.g. insane asylum experience)
2022-06-27 23:28:01 +02:00
f3deec8851
Merge SL-17663 into DRTVWR-548-maint-N
2022-06-25 10:34:47 +03:00
73dc249ab6
SL-17663: Pass the water settings to the settings injector when an experience changes water settings.
2022-06-24 16:33:54 -07:00
10ab905c96
SL-17628 Added attachments can be moved past limit
...
Support 'button up' when losing focus
When releasing button far out of view or by refocusing something, button was not commiting. LLPanelObject last call was sendPosition(btn_down) with btn_down true which resulted in missed update. Now it will get one more call with btn_down==false.
2022-06-25 00:39:36 +03:00
46e0459c82
Merged in SL-17329 (pull request #1036 )
...
SL-17329: Address Mac build error
Approved-by: Andrey Lihatskiy
2022-06-24 21:34:15 +00:00
7bf25aa8b8
SL-17329: Remove unused extra variable initialization
2022-06-24 13:32:14 -07:00
db5806f004
SL-17329: Address Mac build error
2022-06-24 13:31:33 -07:00
5e8fd4f453
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/llappviewer.cpp
2022-06-24 22:22:51 +02:00
49ab735685
Update German translation
2022-06-24 22:20:20 +02:00
cfb6c083fe
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/llfilesystem/lldiskcache.cpp
# indra/llwindow/CMakeLists.txt
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
2022-06-24 22:18:44 +02:00
48d2836ce6
SL-17436 Tools floater drops negative Z position for attachments
2022-06-24 22:07:18 +03:00
8728a68bb7
Merged in SL-17329 (pull request #1035 )
...
SL-17329: Fix cache sizes due to overflow. Improve typing.
Approved-by: Andrey Lihatskiy
2022-06-24 16:57:44 +00:00
4f83471166
SL-17329: Fix cache sizes due to overflow. Improve typing.
2022-06-24 09:21:27 -07:00
264ad0ce0c
mac build fix
2022-06-23 15:17:49 +03:00
662cc980fc
SL-17643 FIXED noninteractive viewer crashes on locations with parcel audio
2022-06-23 13:35:29 +03:00
5770602a4b
FIRE-31767 Updated Russian translation, by Romka Swallowtail
2022-06-23 00:28:56 +02:00
6e686f1ef6
SL-17021: Fix inconsistent header definition for LLAudioEngine_OpenAL
2022-06-22 14:50:28 -07:00
9511040af5
SL-17329: Increase percent of CacheSize allocated to the disk cache from 20% to 40%
2022-06-22 13:28:26 -07:00
0d250e632c
SL-17329: Fix texture cache not respecting DiskCachePercentOfTotal
2022-06-22 13:28:26 -07:00
ccdeac3223
SL-17329: Do logging of individual files after the disk cache purge finishes so it doesn't affect the time measurement.
...
The time resolution of the debug log is in seconds, so it's not particularly useful.
Arguably, one could remove this fine logging in favor of Tracy markers. Or have both. Depends on the use case.
2022-06-22 13:28:25 -07:00
b7ff4d316d
SL-17329: Add advanced developer menu button to purge the disk cache
2022-06-22 13:28:25 -07:00
6259666be0
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llmath/lloctree.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/installers/windows/lang_da.nsi
# indra/newview/installers/windows/lang_de.nsi
# indra/newview/installers/windows/lang_en-us.nsi
# indra/newview/installers/windows/lang_es.nsi
# indra/newview/installers/windows/lang_fr.nsi
# indra/newview/installers/windows/lang_it.nsi
# indra/newview/installers/windows/lang_ja.nsi
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/installers/windows/lang_pt-br.nsi
# indra/newview/installers/windows/lang_ru.nsi
# indra/newview/installers/windows/lang_tr.nsi
# indra/newview/installers/windows/lang_zh.nsi
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvovolume.cpp
2022-06-22 21:11:47 +02:00
2f5d573ac2
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
2022-06-22 19:23:39 +02:00
1167ea994c
SL-17634 Replace deprecated carbon Gestalt calls
2022-06-22 18:00:49 +03:00
3854603ce8
FIRE-31764 French translation update, by Laurent Bechir; Minor Polish update as well
2022-06-22 16:26:57 +02:00
376b700323
Update German translation
2022-06-22 09:05:39 +02:00
820799e193
FIRE-31718 - truncate preprocessed lsl script text in case of an error to prevent the viewer from stalling while trying to fit a massive blob of text into the script editor
2022-06-22 03:20:54 +02:00
0c169dd37a
SL-17590 Telehub beacon sometimes renders black
2022-06-21 23:24:14 +03:00
b97aec0da2
SL-17021: Change meaning of first argument to LLVOVolume::updateRiggedVolume from 'force_update' to 'foce_treat_as_rigged'
2022-06-21 12:33:33 -07:00
1d3b85356f
SL-17021: Only calculate the octree for a skinned mesh if intersection falls inside an on-the-fly calculated bounding box.
...
Technically not a broadphase check, but better than calculating an octree for a bunch of meshes.
2022-06-21 12:33:33 -07:00
0a08645eb6
SL-17021: Do not do software skinning/octree building of a face during picking unless eligible for narrow-phase intersect check (fast broad-phase intersect pre-check not yet implemented)
2022-06-21 12:33:33 -07:00
916da8cfb8
SL-17021: Fix triangle mesh overlays being generated twice when avatar animation is frozen
2022-06-21 12:33:32 -07:00
162280cd98
SL-17021: Templatize LLOctreeNode and related classes to allow for option to store elements in octrees as raw pointers. Use for faster allocation in LLVolumeFace::createOctree.
2022-06-21 12:33:32 -07:00
dbe0cb5865
SL-17021: Clean up some unneeded member variables from lloctree
...
No performance difference measured
2022-06-21 12:33:32 -07:00
076a895062
SL-17635 remove unused variables
2022-06-21 17:55:29 +03:00
503b0d4059
Merge branch 'master' into starlight
2022-06-21 15:58:30 +02:00
c66f444d2b
Cleanup dependency on ui libraries.
2022-06-20 23:29:57 +02:00
2c940a1d80
SL-17633 Crash at LLFocusableElement
2022-06-20 22:51:08 +03:00
0c852a0259
SL-14181 Classifieds show 'loading' despite all data being ready after deleting a classified
2022-06-20 20:33:13 +03:00
750606c7a5
SL-17624 In profiles 'Remove Photo' remains inactive after uploading a photo
2022-06-20 20:16:55 +03:00
791b7ff0e9
SL-17585 Don't bother users with dialogs if we are already quiting
2022-06-20 17:07:49 +03:00
Andrey Lihatskiy