phoenix-firestorm/indra/llprimitive
Ansariel 82b05f1063 Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llui/llfloater.h
#	indra/newview/llfloatersnapshot.h
#	indra/newview/llstatusbar.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/skins/default/xui/da/floater_about.xml
#	indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
#	indra/newview/skins/default/xui/de/strings.xml
#	indra/newview/skins/default/xui/en/floater_snapshot.xml
#	indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
#	indra/newview/skins/default/xui/en/panel_tools_texture.xml
#	indra/newview/skins/default/xui/es/strings.xml
#	indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
#	indra/newview/skins/default/xui/fr/strings.xml
#	indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
#	indra/newview/skins/default/xui/it/strings.xml
#	indra/newview/skins/default/xui/ja/panel_settings_water.xml
#	indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
#	indra/newview/skins/default/xui/ja/strings.xml
#	indra/newview/skins/default/xui/pt/strings.xml
#	indra/newview/skins/default/xui/ru/strings.xml
#	indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
#	indra/newview/skins/default/xui/zh/strings.xml
#	scripts/messages/message_template.msg
#	scripts/messages/message_template.msg.sha1
2025-03-31 23:55:28 +02:00
..
tests
CMakeLists.txt
legacy_object_types.h
lldaeloader.cpp Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer 2024-11-22 18:01:53 +01:00
lldaeloader.h
llgltfloader.cpp
llgltfloader.h
llgltfmaterial.cpp
llgltfmaterial.h
llgltfmaterial_templates.h
lllslconstants.h
llmaterial.cpp
llmaterial.h
llmaterialid.cpp
llmaterialid.h
llmaterialtable.cpp
llmaterialtable.h
llmediaentry.cpp
llmediaentry.h
llmodel.cpp Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer 2024-10-07 10:34:08 +02:00
llmodel.h Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer 2024-10-07 10:34:08 +02:00
llmodelloader.cpp Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer 2024-10-07 10:34:08 +02:00
llmodelloader.h Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer 2024-10-07 10:34:08 +02:00
llprimitive.cpp
llprimitive.h
llprimlinkinfo.h
llprimtexturelist.cpp
llprimtexturelist.h
lltextureanim.cpp
lltextureanim.h
lltextureentry.cpp
lltextureentry.h
lltree_common.h
lltreeparams.cpp
lltreeparams.h
llvolumemessage.cpp
llvolumemessage.h
material_codes.cpp
material_codes.h
object_flags.h Issue #2687: Honor flag sent by server indicating server side autopilot is engaged. When flag is set allow sever to update local avatar rotation. 2025-02-26 15:47:53 -08:00