livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/llprimitive
History
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 Enable /permissive- on MSVC for better standards conformance (#2251) 2024-08-14 08:01:02 -07:00
CMakeLists.txt Merge branch 'develop' of https://github.com/secondlife/viewer 2024-09-13 18:54:12 +02:00
legacy_object_types.h #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
lldaeloader.cpp Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer 2024-11-22 18:01:53 +01:00
lldaeloader.h Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
llgltfloader.cpp Replace glh_linear usage with GLM (#2554) 2024-09-12 11:22:10 -05:00
llgltfloader.h #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
llgltfmaterial.cpp Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now 2024-07-08 20:27:14 +02:00
llgltfmaterial.h Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600 2024-06-13 01:54:18 +02:00
llgltfmaterial_templates.h 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
lllslconstants.h #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
llmaterial.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llmaterial.h Post-merge - trim trailing whitespace 2024-06-10 20:45:59 +03:00
llmaterialid.cpp Reduce LLSD::Binary temporaries 2024-07-05 02:56:25 -04:00
llmaterialid.h #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
llmaterialtable.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llmaterialtable.h Fix line endlings 2024-05-22 22:40:26 +03:00
llmediaentry.cpp 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
llmediaentry.h #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
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 Merge branch 'develop' of https://github.com/secondlife/viewer 2024-08-23 13:47:48 +02:00
llprimitive.h Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-06-11 19:04:21 +02:00
llprimlinkinfo.h #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
llprimtexturelist.cpp Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-09 16:11:24 +02:00
llprimtexturelist.h Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
lltextureanim.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
lltextureanim.h Fix line endlings 2024-05-22 22:40:26 +03:00
lltextureentry.cpp Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-06-11 19:04:21 +02:00
lltextureentry.h #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
lltree_common.h #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
lltreeparams.cpp Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now 2024-07-08 20:27:14 +02:00
lltreeparams.h #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
llvolumemessage.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llvolumemessage.h #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
material_codes.cpp #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
material_codes.h #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
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