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
..
beams	…
beamsColors	…
camera	…
filters	…
fs_static_assets	…
shaders	Merge branch 'release/2025.03' of https://github.com/secondlife/viewer	2025-03-12 19:31:51 +01:00
static_assets	…
windlight	…
anim.ini	…
autoreplace.xml	…
client_list_v2.xml	…
cloud.xml	…
cmd_line.xml	…
commands.xml	[FIRE-35039] Add flag to show/hide the on-screen console	2025-01-01 07:44:47 -04:00
emoji_groups.xml	…
foldertypes.xml	…
graphic_preset_controls.xml	Add RenderTextureVRAMDivisor to list of graphic preset controls	2025-03-08 13:32:35 +01:00
grass.xml	…
grids.xml	[OPENSIM] New grid builder for OpenSim	2024-06-01 21:49:23 +01:00
growl_notifications.xml	…
ignorable_dialogs.xml	…
key_bindings.xml	Add key bindings for Camera Roll	2024-09-18 01:10:54 +02:00
keywords.ini	…
keywords_lsl_default.xml	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-06-21 19:46:51 +02:00
lindenlab.pem	…
llsd-lsl-syntax.rng	…
llsd.xsd	…
logcontrol.xml	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-06-21 19:46:51 +02:00
posestand.xml	…
quick_preferences.xml	…
scriptlibrary_aa.xml	…
scriptlibrary_ossl.xml	…
scriptlibrary_preproc.xml	…
settings.xml	Merge branch 'release/2025.04' of https://github.com/secondlife/viewer	2025-03-31 23:55:28 +02:00
settings_crash_behavior.xml	…
settings_files.xml	…
settings_firestorm.xml	…
settings_hybrid.xml	…
settings_per_account.xml	Add camera roll buttons to the Firestorm Camera floater. The code comes mostly unchanged from the Alchemy viewer source code which is released under the GNU Lesser General Public License.	2024-07-02 00:04:46 +02:00
settings_phoenix.xml	…
settings_text.xml	Disable few more shaders in text mode	2024-12-11 01:58:16 +01:00
settings_v3.xml	…
std_bump.ini	…
trees.xml	…
viewerart.xml	…