c29a661b22
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600
...
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llglslshader.cpp
# indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl
# indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
# indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl
# indra/newview/gltf/accessor.cpp
# indra/newview/gltf/accessor.h
# indra/newview/gltf/animation.h
# indra/newview/gltf/asset.cpp
# indra/newview/gltf/primitive.cpp
# indra/newview/gltf/primitive.h
# indra/newview/gltfscenemanager.h
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llimprocessing.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2024-06-13 01:54:18 +02:00
a17fd2352a
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcharacter/llmotioncontroller.cpp
# indra/llcrashlogger/llcrashlogger.cpp
# indra/llimage/llimagetga.cpp
# indra/llmessage/llregionflags.h
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llscrolllistctrl.cpp
# indra/llui/lltextbase.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/llurlentry.cpp
# indra/newview/llappearancemgr.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/llvocache.cpp
2024-06-09 16:11:24 +02:00
b42f9d836b
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
2024-06-01 15:49:26 +02:00
ea5ead6f4a
Merge remote-tracking branch 'FS600/master'
...
# Conflicts:
# doc/contributions.txt
# indra/llimage/tests/llimageworker_test.cpp
# indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
2024-05-23 18:15:07 +02:00
ca63f18bf2
Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmath/llvolume.cpp
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterimagepreview.h
# indra/newview/llfloaterregioninfo.h
# indra/newview/llmaniprotate.cpp
# indra/newview/llselectmgr.h
# indra/newview/llsurfacepatch.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/notifications.xml
# scripts/messages/message_template.msg.sha1
2024-05-10 14:12:41 +02:00
7fc5f7e649
#1354 Make coroutines use LLCoros::Mutex instead of LLMutex ( #1356 )
...
* #1354 Make coroutines use LLCoros::Mutex instead of LLMutex
* #1354 Fix some more unsafe coroutine executions.
* #1354 Implement changes requested by Nat
2024-05-02 10:57:39 -05:00
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
d927ba575a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llqueuedthread.h
# indra/llcommon/lluuid.cpp
# indra/llcommon/llworkerthread.cpp
# indra/llimage/llimageworker.h
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewermenu.cpp
2023-05-17 21:40:54 +02:00
2f44377b3e
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-05-17 11:17:48 -07:00
2c8130fd8d
Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llsdserialize.h
# indra/newview/llfilepicker_mac.mm
# indra/newview/llviewermessage.cpp
# indra/newview/skins/default/xui/de/floater_profile.xml
# indra/newview/skins/default/xui/es/floater_profile.xml
# indra/newview/skins/default/xui/fr/floater_profile.xml
# indra/newview/skins/default/xui/it/floater_profile.xml
# indra/newview/skins/default/xui/ja/floater_profile.xml
# indra/newview/skins/default/xui/pt/floater_profile.xml
2023-02-10 10:49:36 +01:00
8e03f926c7
SL-18970 Heavy name cache spam
...
If cap fails viewer can spam hundreds of "get legacy for agent" to logs which freezes it.
2023-02-09 01:06:16 +02:00
7649114588
Merge branch master (DRTVWR-571) into DRTVWR-559
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
2022-09-16 21:07:39 +03:00
5a78473123
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/settings.xml
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/skins/default/xui/en/menu_viewer.xml
2022-09-16 11:23:28 +02:00
c5d9c3c2a7
Merge branch 'DRTVWR-563' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/cmake/Tracy.cmake
# indra/llcommon/llprofiler.h
# indra/llcommon/llqueuedthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llimagej2coj/llimagej2coj.cpp
# indra/llkdu/llimagej2ckdu.cpp
# indra/llrender/llimagegl.cpp
# indra/llrender/llimagegl.h
# indra/llwindow/llwindowwin32.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable_mac.txt
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
2022-06-03 15:07:06 +02:00
b6841d75c2
SL-17219 WIP - Texture pipeline overhaul
2022-04-15 19:02:07 -05:00
0e90e53231
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-02-09 10:31:16 +01:00
93805cfbc1
SL-16778 handle shutdown exceptions
...
These exceptions are expected and do not need to be logged
2022-02-07 22:50:37 +02:00
73bc62975e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-03-27 17:48:51 +01:00
6104c3aafc
Now that Kokua yoinked Contact Sets, we can clean up some ugly dependencies... :P
2021-03-22 11:17:09 +01:00
e4f0270887
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-15 11:41:48 +01:00
49039e66ea
Avoid AvNameCache log spam for NULL UUID
2021-02-07 17:20:15 +00:00
7ca874a6e3
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2021-02-02 00:16:25 +01:00
609a26b59a
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master into DRTVWR-515-maint
...
# Conflicts:
# autobuild.xml (llca)
# indra/llwindow/llwindow.h (SL-13507 vs SL-5894)
# indra/newview/llscenemonitor.cpp (SL-14422)
# indra/newview/llvovolume.cpp (SL-12069)
2021-02-01 22:28:15 +02:00
b36082170e
SL-14767 Expanded logging to be a bit more informative
2021-01-28 23:30:27 +02:00
0a2b748705
SL-14078 No point in verifying display name cap each frame #2
2020-10-12 19:40:22 +03:00
fc63aa7424
SL-14078 No point in verifying display name cap each frame
...
Convoluted due to multiple workarounds. Might be a good idea to spend some time refactoring this, but for now just trottled checks.
2020-10-09 21:53:53 +03:00
705b5568c4
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-07-24 23:49:28 +02:00
ae48c7c8b3
Merge branch 'master' into DRTVWR-513-maint
...
# Conflicts:
# indra/llcommon/llerror.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llimprocessing.cpp
# indra/newview/llviewerjoystick.cpp
2020-07-21 11:54:11 +03:00
f116ea4cb7
Merge remote-tracking branch 'fs/master' into fs-vs2017-d476
...
(Note: This removed our changed dullahan, but that's okay as it is
vs2013)
2020-07-20 09:58:30 +02:00
98129be5ef
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
2020-06-17 15:45:05 +02:00
f747f34da4
Merge with RLVa (pre-EEP fix-up)
...
-> Gets a couple of large LL merges out of the way
2020-06-11 12:45:52 +02:00
6fddbeb397
SL-12748 Blocked username displays old name after name change
2020-06-05 16:59:34 +03:00
2a56ab4436
DRTVWR-476, SL-12197: Don't throw Stopping from main coroutine.
...
The new LLCoros::Stop exception is intended to terminate long-lived coroutines
-- not interrupt mainstream shutdown processing. Only throw it on an
explicitly-launched coroutine.
Make LLCoros::getName() (used by the above test) static. As with other LLCoros
methods, it might be called after the LLCoros LLSingleton instance has been
deleted. Requiring the caller to call instance() implies a possible need to
also call wasDeleted(). Encapsulate that nuance into a static method instead.
2020-03-25 19:24:25 -04:00
1ca7b29edf
Merge branch 'appearance/misc' into rlva/development
2019-12-27 15:49:47 +01:00
9335eded97
Merge with viewer-vs2107
2019-12-08 17:18:43 +01:00
95c6b512e1
DRTVWR-476, SL-12197: Don't throw Stopping from main coroutine.
...
The new LLCoros::Stop exception is intended to terminate long-lived coroutines
-- not interrupt mainstream shutdown processing. Only throw it on an
explicitly-launched coroutine.
Make LLCoros::getName() (used by the above test) static. As with other LLCoros
methods, it might be called after the LLCoros LLSingleton instance has been
deleted. Requiring the caller to call instance() implies a possible need to
also call wasDeleted(). Encapsulate that nuance into a static method instead.
2019-11-22 11:58:27 -05:00
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
779b5627c5
DRTVWR-493 LLAvatarNameCache to singletone
2019-07-03 20:06:47 +03:00
60dc664802
Merged with default tip (Revision 241a5b4e3503)
...
--HG--
branch : RLVa
2018-07-20 13:50:30 +02:00
b98e2123a3
Merged with default tip (Revision 07528d0f9440)
...
--HG--
branch : RLVa
2018-03-29 11:11:20 +02:00
bcb8dcee52
Merge viewer-neko
2018-03-13 19:48:24 +01:00
69d87dfb63
MAINT-8364 Fix for requestAvatarNameCache_ crash
2018-03-07 20:31:29 +02:00
25350b9422
Merge viewer-neko
2018-01-30 15:39:28 +01:00
af8984348e
MAINT-8210 Fixed crash in avatar name cache
2018-01-22 20:37:58 +02:00
e6f5aa7f61
MAINT-8210 Fixed crash in avatar name cache
2018-01-22 20:37:58 +02:00
3235691683
Merged with default tip (Revision bd9afd419b6a)
...
--HG--
branch : RLVa
2017-10-21 16:23:22 +02:00
bff6a3af15
Merge viewer-neko
2017-02-23 09:02:58 +01:00
605160d501
MAINT-7118 Swapping legacy people API with new cache
2017-02-15 20:40:03 +02:00
83fef5c904
FIRE-20329: Contact Set aliases not displayed on first post
2016-11-08 00:24:45 +01:00
Ansariel