Ansariel
|
8d154eaa8c
|
Merge branch 'contribute' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llappearance/llavatarappearance.cpp
# indra/llappearance/lldriverparam.cpp
# indra/llappearance/llwearable.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/llthreadsafequeue.h
# indra/newview/app_settings/settings.xml
# indra/newview/llpathfindingnavmesh.cpp
# indra/newview/llviewerassetstorage.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/skins/default/xui/de/floater_flickr.xml
# indra/newview/skins/default/xui/de/panel_flickr_photo.xml
# indra/newview/skins/default/xui/en/floater_about_land.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
# indra/newview/skins/default/xui/fr/floater_flickr.xml
# indra/newview/skins/default/xui/fr/panel_flickr_account.xml
# indra/newview/skins/default/xui/fr/panel_flickr_photo.xml
# indra/newview/skins/default/xui/it/floater_flickr.xml
# indra/newview/skins/default/xui/it/panel_flickr_photo.xml
# indra/newview/skins/default/xui/ja/floater_flickr.xml
# indra/newview/skins/default/xui/ja/panel_flickr_photo.xml
# indra/newview/skins/default/xui/pl/floater_avatar_render_settings.xml
# indra/newview/skins/default/xui/pl/floater_ban_duration.xml
# indra/newview/skins/default/xui/pl/floater_camera_presets.xml
# indra/newview/skins/default/xui/pl/floater_classified.xml
# indra/newview/skins/default/xui/pl/floater_create_landmark.xml
# indra/newview/skins/default/xui/pl/floater_delete_pref_preset.xml
# indra/newview/skins/default/xui/pl/floater_fixedenvironment.xml
# indra/newview/skins/default/xui/pl/floater_flickr.xml
# indra/newview/skins/default/xui/pl/floater_linkreplace.xml
# indra/newview/skins/default/xui/pl/floater_load_pref_preset.xml
# indra/newview/skins/default/xui/pl/floater_my_environments.xml
# indra/newview/skins/default/xui/pl/floater_my_scripts.xml
# indra/newview/skins/default/xui/pl/floater_notifications_tabbed.xml
# indra/newview/skins/default/xui/pl/floater_pick_track.xml
# indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/pl/floater_preferences_view_advanced.xml
# indra/newview/skins/default/xui/pl/floater_preview_trash.xml
# indra/newview/skins/default/xui/pl/floater_profile.xml
# indra/newview/skins/default/xui/pl/floater_settings_picker.xml
# indra/newview/skins/default/xui/pl/floater_simple_outfit_snapshot.xml
# indra/newview/skins/default/xui/pl/menu_avatar_rendering_settings.xml
# indra/newview/skins/default/xui/pl/menu_avatar_rendering_settings_add.xml
# indra/newview/skins/default/xui/pl/panel_flickr_photo.xml
# indra/newview/skins/default/xui/pl/panel_progress.xml
# indra/newview/skins/default/xui/pl/panel_settings_sky_atmos.xml
# indra/newview/skins/default/xui/pl/panel_settings_sky_clouds.xml
# indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml
# indra/newview/skins/default/xui/ru/floater_flickr.xml
# indra/newview/skins/default/xui/ru/panel_flickr_account.xml
# indra/newview/skins/default/xui/ru/panel_flickr_photo.xml
|
2023-01-13 15:19:29 +01:00 |
|
Nat Goodspeed
|
12f66fda13
|
DRTVWR-565: Merge branch 'origin/contribute' into DRTVWR-565
|
2022-12-12 13:27:57 -05:00 |
|
Nat Goodspeed
|
5a74f7648a
|
DRTVWR-575: A few more tweaks addressing size_t wider than 32 bits.
|
2022-11-03 15:18:32 -04:00 |
|
Ansariel
|
1ca8584322
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-10-22 15:48:47 +02:00 |
|
Andrey Lihatskiy
|
97b676b60f
|
Merge branch 'master' into DRTVWR-565-maint-P
|
2022-10-20 21:43:54 +03:00 |
|
Ansariel
|
2507bc6137
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-09-15 20:37:16 +02:00 |
|
Ansariel
|
656dd12dfc
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/newview/llmodelpreview.h
|
2022-09-15 20:35:44 +02:00 |
|
Andrey Lihatskiy
|
329268c5f7
|
Merge branch 'master' into DRTVWR-548-maint-N
# Conflicts:
# indra/newview/llmodelpreview.h
|
2022-09-15 20:44:04 +03:00 |
|
Andrey Lihatskiy
|
b5861e58cb
|
Merge branch 'master' into DRTVWR-565-maint-P
|
2022-09-15 20:43:02 +03:00 |
|
Ansariel
|
41d07e237a
|
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
|
2022-08-31 16:05:55 +02:00 |
|
Andrey Kleshchev
|
09400b74ad
|
SL-17902 Crash at LLAlignedArray, out of bounds
|
2022-08-04 22:14:08 +03:00 |
|
Ansariel
|
bf24665fa6
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-08-04 16:36:35 +02:00 |
|
Ansariel
|
49b6f9b312
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-08-04 14:52:20 +02:00 |
|
Ansariel
|
6d09c9ff89
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-08-04 12:37:05 +02:00 |
|
Andrey Lihatskiy
|
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 |
|
Andrey Lihatskiy
|
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 |
|
Andrey Lihatskiy
|
dfc1175546
|
Merge branch 'master' into DRTVWR-565-maint-P
|
2022-08-04 00:12:26 +03:00 |
|
Ansariel
|
0d0d82fa97
|
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
|
2022-08-02 12:08:32 +02:00 |
|
Ansariel
|
1e50da6b7a
|
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
|
2022-07-27 02:06:54 +02:00 |
|
Cosmic Linden
|
cdff716908
|
SL-17801: Don't let external code delete the raw pointer to the picking octree
|
2022-07-26 10:40:19 -07:00 |
|
Cosmic Linden
|
f1128da8da
|
SL-17801: Use raw array for mOctreeTriangles to avoid memory alignment issues, increasing risk of crashes during picking due to SIMD operations
|
2022-07-26 10:40:19 -07:00 |
|
Ansariel
|
9232846287
|
Build fix
|
2022-07-22 12:41:14 +02:00 |
|
Ansariel
|
f9f81ebe20
|
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
|
2022-07-22 12:19:11 +02:00 |
|
Cosmic Linden
|
4ef83bb8bd
|
SL-17801: Add various safeguards to keep triangle indices count valid
|
2022-07-21 15:19:00 -07:00 |
|
Ansariel
|
33621382b4
|
Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llfloateroutfitsnapshot.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreference.h
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
|
2022-07-21 19:54:15 +02:00 |
|
Andrey Kleshchev
|
f4e6ccc2c4
|
SL-17796 Crash at LLVolumeFace::getVertexData
|
2022-07-19 21:08:51 +03:00 |
|
Andrey Kleshchev
|
a330095650
|
SL-16793 Potential crash at createSide
|
2022-07-07 00:01:33 +03:00 |
|
Andrey Kleshchev
|
c01388fb0b
|
SL-16793 Crash at LLProfile::addHole
addHole can be accessed from main tread and from mesh thread, safeguard pt
|
2022-07-06 21:24:25 +03:00 |
|
Ansariel
|
d5501d459b
|
Merge branch 'DRTVWR-561-maint-O' of https://bitbucket.org/lindenlab/viewer
|
2022-07-01 11:36:10 +02:00 |
|
Ansariel
|
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 |
|
Cosmic Linden
|
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 |
|
Maxim Nikolenko
|
076a895062
|
SL-17635 remove unused variables
|
2022-06-21 17:55:29 +03:00 |
|
Andrey Kleshchev
|
f451672b0c
|
SL-17475 Fix wrong remap buffer size
|
2022-06-16 16:46:04 +03:00 |
|
Andrey Kleshchev
|
b1cbf369cf
|
SL-17475 Use a shadow indices buffer before simplification
|
2022-06-14 21:41:27 +03:00 |
|
Andrey Kleshchev
|
45bcefd981
|
SL-17475 fix remap causing an assert
|
2022-06-14 16:40:56 +03:00 |
|
Andrey Kleshchev
|
b08340f183
|
SL-17475 Remap models before simplification
|
2022-06-11 10:23:46 +03:00 |
|
Ansariel
|
c9407feece
|
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
|
2022-05-10 19:14:02 +02:00 |
|
Andrey Kleshchev
|
43517c5adc
|
SL-17244 Fix 'empty leaf' crashes
|
2022-05-05 19:41:56 +03:00 |
|
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 |