199 Commits (c513ebb777b5345416683404454125cd94de838c)

Author	SHA1	Message	Date
Ansariel	d19e6abc5e	Merge branch 'release/2025.03' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llappviewer.cpp # indra/newview/llgiveinventory.cpp # indra/newview/llstartup.cpp # indra/newview/lltooldraganddrop.cpp # indra/newview/llvoavatar.cpp # indra/newview/skins/default/xui/fr/floater_avatar_textures.xml # indra/newview/skins/default/xui/it/floater_avatar_textures.xml # indra/newview/skins/default/xui/ja/floater_avatar_textures.xml # indra/newview/skins/default/xui/pl/floater_avatar_textures.xml # indra/newview/skins/default/xui/zh/floater_avatar_textures.xml	2025-03-01 01:09:19 +01:00
Andrew Meadows	6d0b0a77ee	drain UDP socket to avoid dropped packets (#3565) ... drain UDP socket in idleNetwork() to avoid dropped packets	2025-02-18 11:38:52 -08:00
Ansariel	d99fbffb6d	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llimage/llimage.cpp # indra/llmath/llvolume.cpp # indra/newview/gltf/asset.cpp # indra/newview/lldynamictexture.cpp # indra/newview/lltexturectrl.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvovolume.cpp	2024-06-11 20:25:22 +02:00
Ansariel	18903f6cac	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # indra/llappearance/llavatarappearance.h # indra/llimage/llimage.cpp # indra/llmath/llvolume.cpp # indra/llmath/llvolume.h # indra/llprimitive/llgltfmaterial.h # indra/llrender/llshadermgr.cpp # indra/newview/lldynamictexture.cpp # indra/newview/llenvironment.cpp # indra/newview/llfetchedgltfmaterial.cpp # indra/newview/llfloaterimagepreview.cpp # indra/newview/llfloaterimagepreview.h # indra/newview/llfloaterpreference.cpp # indra/newview/llfloaterregioninfo.cpp # indra/newview/llfloaterregioninfo.h # indra/newview/llmaniprotate.cpp # indra/newview/llmaniptranslate.cpp # indra/newview/llpanelvolume.cpp # indra/newview/llselectmgr.cpp # indra/newview/llselectmgr.h # indra/newview/llsurface.cpp # indra/newview/llsurface.h # indra/newview/llsurfacepatch.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/lltinygltfhelper.cpp # indra/newview/llviewerregion.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llviewerwindow.h # indra/newview/llvlcomposition.cpp # indra/newview/llvlcomposition.h # indra/newview/llvocache.cpp # indra/newview/llvovolume.cpp # indra/newview/pipeline.cpp	2024-06-11 19:04:21 +02:00
Andrey Lihatskiy	3d4bc98f6b	Trim remaining trailing whitespaces after #1695	2024-06-11 17:38:48 +03:00
Ansariel	d9789bfaf2	Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A ... # Conflicts: # indra/llappearance/llavatarappearance.h # indra/llimage/llimage.cpp # indra/llmath/llvolume.cpp # indra/llmath/llvolume.h # indra/llprimitive/llgltfmaterial.h # indra/llrender/llrendertarget.cpp # indra/llrender/llshadermgr.cpp # indra/newview/lldynamictexture.cpp # indra/newview/llenvironment.cpp # indra/newview/llfetchedgltfmaterial.cpp # indra/newview/llfloaterimagepreview.cpp # indra/newview/llfloaterimagepreview.h # indra/newview/llfloaterregioninfo.cpp # indra/newview/llfloaterregioninfo.h # indra/newview/llmaniprotate.cpp # indra/newview/llmaniptranslate.cpp # indra/newview/llpanelvolume.cpp # indra/newview/llselectmgr.cpp # indra/newview/llselectmgr.h # indra/newview/llsurface.cpp # indra/newview/llsurface.h # indra/newview/llsurfacepatch.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/lltinygltfhelper.cpp # indra/newview/llviewertexture.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llviewerwindow.h # indra/newview/llvlcomposition.cpp # indra/newview/llvlcomposition.h # indra/newview/llvocache.cpp # indra/newview/llvovolume.cpp # indra/newview/pipeline.cpp	2024-06-11 13:38:43 +02:00
Brad Linden	7c42711ca3	Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development	2024-06-10 16:22:12 -07:00
Ansariel	591c75ebaf	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llappearance/llavatarappearance.cpp # indra/llmath/llvolume.cpp # indra/llmessage/llcorehttputil.cpp # indra/llrender/llgl.cpp # indra/newview/installers/darwin/apple-notarize.sh # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llfloater360capture.cpp # indra/newview/llfloateremojipicker.cpp # indra/newview/llpanelpeople.cpp # indra/newview/llviewertexture.cpp # indra/newview/viewer_manifest.py	2024-06-10 21:53:31 +02:00
Ansariel	4b52dd754b	Fix incorrect use of VX/VY/VZ/VW indices when color components are accessed	2024-06-10 19:30:17 +03:00
Ansariel	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
Brad Linden	7889df945b	Merge remote-tracking branch 'origin/release/materials_featurette' into project/gltf_development	2024-06-04 17:39:39 -07:00
Ansariel	2c46d3468c	Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llappearance/llavatarappearance.cpp	2024-05-30 22:55:21 +02:00
Ansariel	cb3bd8865a	Fix a bunch of uninitialized variable warnings that showed up in Visual Studio	2024-05-30 15:41:36 +02:00
Andrey Kleshchev	12cd8589b4	viewer#1568 Revert "SL-17597 AV height in Shape dialog IS WRONG" ... This reverts commit f5a7c22cea to fix viewer#1568.	2024-05-29 11:05:22 +03:00
Ansariel	e2e37cced8	Fix line endlings	2024-05-22 22:40:26 +03:00
Ansariel	1b67dd855c	Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A ... # Conflicts: # autobuild.xml # indra/cmake/CMakeLists.txt # indra/cmake/GoogleMock.cmake # indra/llaudio/llaudioengine_fmodstudio.cpp # indra/llaudio/llaudioengine_fmodstudio.h # indra/llaudio/lllistener_fmodstudio.cpp # indra/llaudio/lllistener_fmodstudio.h # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/llaudio/llstreamingaudio_fmodstudio.h # indra/llcharacter/llmultigesture.cpp # indra/llcharacter/llmultigesture.h # indra/llimage/llimage.cpp # indra/llimage/llimagepng.cpp # indra/llimage/llimageworker.cpp # indra/llimage/tests/llimageworker_test.cpp # indra/llmessage/tests/llmockhttpclient.h # indra/llprimitive/llgltfmaterial.h # indra/llrender/llfontfreetype.cpp # indra/llui/llcombobox.cpp # indra/llui/llfolderview.cpp # indra/llui/llfolderviewmodel.h # indra/llui/lllineeditor.cpp # indra/llui/lllineeditor.h # indra/llui/lltextbase.cpp # indra/llui/lltextbase.h # indra/llui/lltexteditor.cpp # indra/llui/lltextvalidate.cpp # indra/llui/lltextvalidate.h # indra/llui/lluictrl.h # indra/llui/llview.cpp # indra/llwindow/llwindowmacosx.cpp # indra/newview/app_settings/settings.xml # indra/newview/llappearancemgr.cpp # indra/newview/llappearancemgr.h # indra/newview/llavatarpropertiesprocessor.cpp # indra/newview/llavatarpropertiesprocessor.h # indra/newview/llbreadcrumbview.cpp # indra/newview/llbreadcrumbview.h # indra/newview/llbreastmotion.cpp # indra/newview/llbreastmotion.h # indra/newview/llconversationmodel.h # indra/newview/lldensityctrl.cpp # indra/newview/lldensityctrl.h # indra/newview/llface.inl # indra/newview/llfloatereditsky.cpp # indra/newview/llfloatereditwater.cpp # indra/newview/llfloateremojipicker.h # indra/newview/llfloaterimsessiontab.cpp # indra/newview/llfloaterprofiletexture.cpp # indra/newview/llfloaterprofiletexture.h # indra/newview/llgesturemgr.cpp # indra/newview/llgesturemgr.h # indra/newview/llimpanel.cpp # indra/newview/llimpanel.h # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryclipboard.cpp # indra/newview/llinventoryclipboard.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorygallery.cpp # indra/newview/lllistbrowser.cpp # indra/newview/lllistbrowser.h # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llpanelprofile.h # indra/newview/llpreviewgesture.cpp # indra/newview/llsavedsettingsglue.cpp # indra/newview/llsavedsettingsglue.h # indra/newview/lltooldraganddrop.cpp # indra/newview/llurllineeditorctrl.cpp # indra/newview/llvectorperfoptions.cpp # indra/newview/llvectorperfoptions.h # indra/newview/llviewerparceloverlay.cpp # indra/newview/llviewertexlayer.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/macmain.h # indra/test/test.cpp	2024-05-22 19:04:52 +02:00
Ansariel	0ecfbc3de9	Merge remote-tracking branch 'LGPL/master' ... # Conflicts: # autobuild.xml # indra/cmake/CMakeLists.txt # indra/cmake/GoogleMock.cmake # indra/llappearance/llwearable.cpp # indra/llcharacter/llmultigesture.cpp # indra/llcharacter/llmultigesture.h # indra/llimage/llimage.cpp # indra/llimage/llimagepng.cpp # indra/llimage/llimageworker.cpp # indra/llmessage/tests/llmockhttpclient.h # indra/llrender/llfontfreetype.cpp # indra/llui/llcombobox.cpp # indra/llui/llfolderview.cpp # indra/llui/llfolderviewmodel.h # indra/llui/lllineeditor.cpp # indra/llui/lllineeditor.h # indra/llui/lltextbase.cpp # indra/llui/lltextbase.h # indra/llui/lltexteditor.cpp # indra/llui/lltextvalidate.cpp # indra/llui/lltextvalidate.h # indra/llui/lluictrl.h # indra/llui/llview.cpp # indra/llwindow/llwindowmacosx.cpp # indra/newview/app_settings/settings.xml # indra/newview/llappearancemgr.cpp # indra/newview/llappearancemgr.h # indra/newview/llavatarpropertiesprocessor.h # indra/newview/llbreadcrumbview.cpp # indra/newview/llbreadcrumbview.h # indra/newview/llbreastmotion.cpp # indra/newview/llbreastmotion.h # indra/newview/llconversationmodel.h # indra/newview/lldensityctrl.cpp # indra/newview/lldensityctrl.h # indra/newview/llface.inl # indra/newview/llfloatereditsky.cpp # indra/newview/llfloatereditwater.cpp # indra/newview/llfloateremojipicker.h # indra/newview/llfloaterimsessiontab.cpp # indra/newview/llfloaterprofiletexture.cpp # indra/newview/llfloaterprofiletexture.h # indra/newview/llgesturemgr.cpp # indra/newview/llgesturemgr.h # indra/newview/llgroupactions.cpp # indra/newview/llimpanel.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryclipboard.cpp # indra/newview/llinventoryclipboard.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorygallery.cpp # indra/newview/lllistbrowser.cpp # indra/newview/lllistbrowser.h # indra/newview/llpaneleditwearable.cpp # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llpreviewgesture.cpp # indra/newview/llsavedsettingsglue.cpp # indra/newview/llsavedsettingsglue.h # indra/newview/lltooldraganddrop.cpp # indra/newview/llurllineeditorctrl.cpp # indra/newview/llvectorperfoptions.cpp # indra/newview/llvectorperfoptions.h # indra/newview/llviewermenu.cpp # indra/newview/llviewerparceloverlay.cpp # indra/newview/llviewertexlayer.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/macmain.h	2024-05-16 14:10:55 +02:00
Ansariel	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
Andrey Lihatskiy	38c2a5bde9	Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge	2024-05-01 08:16:58 +03:00
Andrey Lihatskiy	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
Ansariel	b527620dfc	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-04-24 19:53:03 +02:00
Ansariel	7a2070d795	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # indra/llimage/llimage.cpp # indra/llui/llsearcheditor.cpp # indra/llui/llview.cpp # indra/newview/llagent.cpp # indra/newview/llappviewer.cpp # indra/newview/llfloatercamera.cpp # indra/newview/llfloatereditsky.cpp # indra/newview/llfloatereditwater.cpp # indra/newview/llinventorybridge.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llpanelgroupbulkban.cpp # indra/newview/llscrollingpanelparam.cpp # indra/newview/llselectmgr.cpp # indra/newview/llsidepanelappearance.cpp # indra/newview/lltooldraganddrop.cpp # indra/newview/llvovolume.cpp	2024-04-24 18:59:46 +02:00
Andrey Lihatskiy	85f2447b3d	Merge branch 'main' into marchcat/a-merge ... # Conflicts: # autobuild.xml # indra/llimage/llimage.cpp # indra/llui/llsearcheditor.cpp # indra/llui/llview.cpp # indra/newview/llagent.cpp # indra/newview/llappviewer.cpp # indra/newview/llfloatercamera.cpp # indra/newview/llfloatereditsky.cpp # indra/newview/llfloatereditwater.cpp # indra/newview/llinventoryfunctions.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llpanelgroupbulkban.cpp # indra/newview/llsidepanelappearance.cpp # indra/newview/llvovolume.cpp	2024-04-24 19:28:15 +03:00
Andrey Lihatskiy	428f21cf79	Merge branch 'main' into marchcat/x-merge	2024-04-24 18:45:54 +03:00
Ansariel	9dc3651d0c	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llappearance/lltexlayer.cpp # indra/llappearance/lltexlayer.h # indra/llappearance/lltexlayerparams.cpp # indra/llappearance/llwearabletype.cpp # indra/llcharacter/llbvhloader.cpp # indra/llcharacter/llbvhloader.h # indra/llcharacter/llcharacter.cpp # indra/llcharacter/llcharacter.h # indra/llcharacter/lljoint.h # indra/llcharacter/llvisualparam.cpp # indra/llfilesystem/lldir_win32.cpp # indra/llfilesystem/lldir_win32.h # indra/llinventory/llparcel.cpp # indra/llmath/llmath.h # indra/llmath/llvolume.cpp # indra/llmessage/lldatapacker.h # indra/llxml/llxmltree.h # indra/newview/CMakeLists.txt # indra/newview/llagentwearables.cpp # indra/newview/llagentwearables.h # indra/newview/lldirpicker.cpp # indra/newview/llphysicsmotion.cpp # indra/newview/llviewergesture.cpp # indra/newview/llviewerjointattachment.cpp # indra/newview/llviewermessage.cpp # indra/newview/llviewertexlayer.cpp # indra/newview/llviewertexlayer.h # indra/newview/llvoavatarself.cpp # indra/newview/llvoavatarself.h	2024-02-18 00:09:57 +01:00
Lars Næsbye Christensen	9e854b697a	misc: BOOL to bool	2024-02-17 12:23:07 +02:00
Ansariel	9a044f4a52	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llappearance/llavatarappearance.cpp # indra/llappearance/llavatarappearance.h # indra/llappearance/lldriverparam.h # indra/llappearance/llviewervisualparam.cpp # indra/llaudio/llaudiodecodemgr.cpp # indra/llcharacter/llcharacter.cpp # indra/llfilesystem/llfilesystem.cpp # indra/newview/llagent.cpp # indra/newview/llcallbacklist.cpp # indra/newview/llfloaterpreference.cpp # indra/newview/llpanelnearbymedia.cpp # indra/newview/llpanelnearbymedia.h # indra/newview/llpanelobjectinventory.cpp # indra/newview/llvoavatar.h # indra/newview/llvovolume.cpp # indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml	2024-02-13 00:54:24 +01:00
Andrey Lihatskiy	2d8654db9c	VS build fix: missed values	2024-02-12 23:17:42 +02:00
Lars Næsbye Christensen	70f8dc7a4f	miscellaneous: BOOL (int) to real bool	2024-02-12 23:17:22 +02:00
Ansariel	45dc1a63f0	Merge branch 'DRTVWR-599-maint-Z' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llprimitive/lldaeloader.cpp # indra/llui/lllayoutstack.cpp # indra/llui/llnotifications.h # indra/llui/lltoolbar.cpp # indra/newview/CMakeLists.txt # indra/newview/llagent.cpp # indra/newview/llappviewer.cpp # indra/newview/llfloaterimcontainer.cpp # indra/newview/llfloaterimnearbychathandler.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llpaneloutfitsinventory.h # indra/newview/llsidepanelappearance.h # indra/newview/lltoolbarview.cpp	2024-01-12 14:18:34 +01:00
Andrey Kleshchev	e5ef481cd3	SL-20781 Follow up on boost to std replacement	2024-01-09 00:19:39 +02:00
AiraYumi	7c8907522f	replace boost library to standard	2024-01-08 23:29:21 +02:00
Ansariel	e6f3c39327	Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llappearance/llavatarappearance.cpp # indra/llappearance/llwearable.cpp # indra/newview/llinventorymodel.cpp	2023-12-12 14:53:58 +01:00
Alexander Gavriliuk	f5a7c22cea	SL-17597 AV height in Shape dialog IS WRONG	2023-12-12 08:24:03 +01:00
Ansariel	056407518d	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llpanelface.cpp # indra/newview/lltexturectrl.cpp	2023-07-28 18:16:42 +02:00
Alexander Gavriliuk	a22dfc28a1	SL-18619 Eyes not rendering in Shape floater thumbnails	2023-07-27 05:02:43 +02:00
Andrey Kleshchev	6c54c9f8a9	Merge branch 'main' into DRTVWR-577-maint-S ... # Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/newview/llfilepicker.h # indra/newview/llfilepicker_mac.h # indra/newview/llfilepicker_mac.mm	2023-02-09 22:33:52 +02:00
Ansariel	fb727de6e3	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/newview/llfilepicker.h # indra/newview/llfilepicker_mac.h # indra/newview/llfilepicker_mac.mm # indra/newview/llmeshrepository.cpp	2023-02-03 22:33:41 +01:00
Ansariel	6ae8248f5d	Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llinventory/llsettingssky.cpp # indra/llui/llfolderviewitem.h # indra/newview/llappviewer.cpp # indra/newview/skins/default/xui/de/floater_about_land.xml # indra/newview/skins/default/xui/de/floater_avatar_textures.xml # indra/newview/skins/default/xui/de/floater_camera.xml # indra/newview/skins/default/xui/de/floater_camera_presets.xml # indra/newview/skins/default/xui/de/floater_linkreplace.xml # indra/newview/skins/default/xui/de/floater_people.xml # indra/newview/skins/default/xui/de/floater_preferences_view_advanced.xml # indra/newview/skins/default/xui/de/floater_preview_trash.xml # indra/newview/skins/default/xui/de/floater_save_camera_preset.xml # indra/newview/skins/default/xui/de/menu_gallery_outfit_tab.xml # indra/newview/skins/default/xui/de/notifications.xml # indra/newview/skins/default/xui/de/panel_group_creation_sidetray.xml # indra/newview/skins/default/xui/de/panel_group_roles.xml # indra/newview/skins/default/xui/de/panel_login.xml # indra/newview/skins/default/xui/de/panel_notification_list_item.xml # indra/newview/skins/default/xui/de/panel_outfit_gallery.xml # indra/newview/skins/default/xui/de/panel_outfit_gallery_item.xml # indra/newview/skins/default/xui/de/panel_preferences_sound.xml # indra/newview/skins/default/xui/de/panel_progress.xml # indra/newview/skins/default/xui/de/panel_region_environment.xml # indra/newview/skins/default/xui/de/strings.xml # indra/newview/skins/default/xui/de/teleport_strings.xml # indra/newview/skins/default/xui/es/floater_animation_anim_preview.xml # indra/newview/skins/default/xui/es/floater_animation_bvh_preview.xml # indra/newview/skins/default/xui/es/floater_camera.xml # indra/newview/skins/default/xui/es/floater_god_tools.xml # indra/newview/skins/default/xui/es/floater_people.xml # indra/newview/skins/default/xui/es/floater_tools.xml # indra/newview/skins/default/xui/es/menu_viewer.xml # indra/newview/skins/default/xui/es/notifications.xml # indra/newview/skins/default/xui/es/panel_group_roles.xml # indra/newview/skins/default/xui/es/panel_landmark_info.xml # indra/newview/skins/default/xui/es/panel_login.xml # indra/newview/skins/default/xui/es/panel_preferences_sound.xml # indra/newview/skins/default/xui/es/panel_prim_media_controls.xml # indra/newview/skins/default/xui/es/strings.xml # indra/newview/skins/default/xui/es/teleport_strings.xml # indra/newview/skins/default/xui/fr/floater_avatar_textures.xml # indra/newview/skins/default/xui/fr/floater_camera.xml # indra/newview/skins/default/xui/fr/floater_camera_presets.xml # indra/newview/skins/default/xui/fr/floater_forget_user.xml # indra/newview/skins/default/xui/fr/floater_linkreplace.xml # indra/newview/skins/default/xui/fr/floater_people.xml # indra/newview/skins/default/xui/fr/floater_preferences_view_advanced.xml # indra/newview/skins/default/xui/fr/floater_preview_trash.xml # indra/newview/skins/default/xui/fr/floater_save_camera_preset.xml # indra/newview/skins/default/xui/fr/menu_gallery_outfit_tab.xml # indra/newview/skins/default/xui/fr/menu_viewer.xml # indra/newview/skins/default/xui/fr/notifications.xml # indra/newview/skins/default/xui/fr/panel_group_creation_sidetray.xml # indra/newview/skins/default/xui/fr/panel_group_roles.xml # indra/newview/skins/default/xui/fr/panel_login.xml # indra/newview/skins/default/xui/fr/panel_notification_list_item.xml # indra/newview/skins/default/xui/fr/panel_outfit_gallery.xml # indra/newview/skins/default/xui/fr/panel_outfit_gallery_item.xml # indra/newview/skins/default/xui/fr/panel_preferences_sound.xml # indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml # indra/newview/skins/default/xui/fr/panel_progress.xml # indra/newview/skins/default/xui/fr/panel_region_environment.xml # indra/newview/skins/default/xui/fr/strings.xml # indra/newview/skins/default/xui/fr/teleport_strings.xml # indra/newview/skins/default/xui/fr/widgets/density_ctrl.xml # indra/newview/skins/default/xui/it/floater_avatar_textures.xml # indra/newview/skins/default/xui/it/floater_camera.xml # indra/newview/skins/default/xui/it/floater_camera_presets.xml # indra/newview/skins/default/xui/it/floater_god_tools.xml # indra/newview/skins/default/xui/it/floater_media_browser.xml # indra/newview/skins/default/xui/it/floater_people.xml # indra/newview/skins/default/xui/it/floater_preferences_view_advanced.xml # indra/newview/skins/default/xui/it/floater_save_camera_preset.xml # indra/newview/skins/default/xui/it/floater_stats.xml # indra/newview/skins/default/xui/it/menu_login.xml # indra/newview/skins/default/xui/it/menu_viewer.xml # indra/newview/skins/default/xui/it/notifications.xml # indra/newview/skins/default/xui/it/panel_group_roles.xml # indra/newview/skins/default/xui/it/panel_landmark_info.xml # indra/newview/skins/default/xui/it/panel_login.xml # indra/newview/skins/default/xui/it/panel_notifications_channel.xml # indra/newview/skins/default/xui/it/panel_outfit_gallery.xml # indra/newview/skins/default/xui/it/panel_outfit_gallery_item.xml # indra/newview/skins/default/xui/it/panel_place_profile.xml # indra/newview/skins/default/xui/it/panel_preferences_sound.xml # indra/newview/skins/default/xui/it/panel_prim_media_controls.xml # indra/newview/skins/default/xui/it/panel_region_environment.xml # indra/newview/skins/default/xui/it/sidepanel_appearance.xml # indra/newview/skins/default/xui/it/strings.xml # indra/newview/skins/default/xui/it/teleport_strings.xml # indra/newview/skins/default/xui/ja/floater_camera.xml # indra/newview/skins/default/xui/ja/floater_camera_presets.xml # indra/newview/skins/default/xui/ja/floater_people.xml # indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml # indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml # indra/newview/skins/default/xui/ja/notifications.xml # indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml # indra/newview/skins/default/xui/ja/panel_group_roles.xml # indra/newview/skins/default/xui/ja/panel_login.xml # indra/newview/skins/default/xui/ja/panel_notification_list_item.xml # indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml # indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml # indra/newview/skins/default/xui/ja/panel_preferences_sound.xml # indra/newview/skins/default/xui/ja/panel_region_environment.xml # indra/newview/skins/default/xui/ja/strings.xml # indra/newview/skins/default/xui/ja/teleport_strings.xml # indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml # indra/newview/skins/default/xui/pl/panel_group_creation_sidetray.xml # indra/newview/skins/default/xui/pl/panel_outfit_gallery.xml # indra/newview/skins/default/xui/pl/panel_outfit_snapshot_inventory.xml # indra/newview/skins/default/xui/pl/panel_profile_firstlife.xml # indra/newview/skins/default/xui/pl/panel_profile_pick.xml # indra/newview/skins/default/xui/pl/panel_profile_picks.xml # indra/newview/skins/default/xui/pl/panel_profile_secondlife.xml # indra/newview/skins/default/xui/pl/panel_region_access.xml # indra/newview/skins/default/xui/pl/panel_script_experience.xml # indra/newview/skins/default/xui/pt/notifications.xml # indra/newview/skins/default/xui/pt/panel_group_roles.xml # indra/newview/skins/default/xui/pt/panel_landmark_info.xml # indra/newview/skins/default/xui/pt/panel_login.xml # indra/newview/skins/default/xui/pt/panel_preferences_sound.xml # indra/newview/skins/default/xui/pt/strings.xml	2023-01-25 14:40:06 +01:00
Andrey Lihatskiy	8ec8732ec9	SL-18893 OSX buildfix	2023-01-16 23:16:43 +02:00
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
Fawrsk	7419037ef6	SL-18893 Fixes for pull requests #38, #41, and #42 (#46) ... Eliminate unnecessary copies, and remove uses of auto	2023-01-10 11:43:27 +02:00
Fawrsk	74a9280c69	SL-18893 Clean up for loops in llappearance to use C++11 range based for loops (#38)	2023-01-03 23:08:15 +02:00
Ansariel	8b0d341aca	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-10-21 12:34:53 +02:00
Andrey Lihatskiy	e0ace0c722	Merge branch 'master' into DRTVWR-570-maint-Q ... # Conflicts: # indra/newview/llnetmap.cpp # indra/newview/llnetmap.h	2022-10-20 22:34:11 +03:00
Ansariel	47964fb28d	Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer	2022-10-20 16:47:38 +02:00
Rye Mutt	5326e3a206	Fix leak of mRoot during LLAvatarAppearance destruction	2022-10-19 22:17:34 -04:00
Ansariel	5cdd8cdb6e	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546	2022-05-26 11:43:21 +02:00
Andrey Lihatskiy	91606c7b60	Merge branch 'master' into DRTVWR-548-maint-N	2022-05-26 03:07:05 +03:00
Ansariel	b96f92f884	Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer	2022-05-19 20:31:00 +02:00