Ansariel
|
4a438dcfd4
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llcallstack.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvovolume.cpp
|
2024-08-23 13:47:48 +02:00 |
|
Cosmic Linden
|
1743fe92d6
|
secondlife/viewer#2391: Remove avatar rigging "callstack" logging
|
2024-08-22 09:18:52 -07: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
|
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
|
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 |
|
Lars Næsbye Christensen
|
1839def9dc
|
even more misc: BOOL (int) to real bool
|
2024-02-12 23:17:22 +02:00 |
|
Lars Næsbye Christensen
|
4419bb8709
|
more misc: BOOL (int) to real bool
|
2024-02-12 23:17:22 +02:00 |
|
Lars Næsbye Christensen
|
70f8dc7a4f
|
miscellaneous: BOOL (int) to real bool
|
2024-02-12 23:17:22 +02: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
|
63cc972499
|
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
|
2021-11-12 17:31:39 +01:00 |
|
Dave Parks
|
8d20480c5f
|
SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
|
2021-10-28 18:06:21 +00:00 |
|
Ansariel
|
61c56570ab
|
Merge viewer-eep
|
2019-08-13 19:05:23 +02:00 |
|
Graham Linden
|
76128c4357
|
SL-10566 Use vector for some high-traffic, low-item count containers instead of list.
Provide method of storing joint indices sep from weight data for faster runtime processing.
|
2019-08-05 12:04:29 -07:00 |
|
Brad Payne (Vir Linden)
|
eebf1639c7
|
SL-534 - make handling of other-gender sliders more consistent. Fixes mGroin bug.
|
2016-11-18 09:39:14 -05:00 |
|
Brad Payne (Vir Linden)
|
4c2144e115
|
SL-534 - make handling of other-gender sliders more consistent. Fixes mGroin bug.
|
2016-11-18 09:39:14 -05:00 |
|
Ansariel
|
ef3b8ad594
|
Merge bento-box
|
2016-09-28 14:45:26 +02:00 |
|
Brad Payne (Vir Linden)
|
a2875ba53e
|
merge
|
2016-09-02 14:34:06 -04:00 |
|
Ansariel
|
4acba68785
|
Merge bento-box
|
2016-08-11 00:16:36 +02:00 |
|
Brad Payne (Vir Linden)
|
95d9e85f95
|
SL-109 - made viewer much less tolerant of bad data in avatar_skeleton.xml or avatar_lad.xml. If either of these is broken, there's no point trying to continue, more informative to just error out with an appropriate message.
|
2016-08-09 15:24:09 -04:00 |
|
Ansariel
|
575c28239d
|
Merge bento-box
|
2016-07-06 09:24:11 +02:00 |
|
Brad Payne (Vir Linden)
|
5ebf9b3cae
|
SL-426 - strings.xml fix for pec attachments, SL-402 - diagnostics for investigation
|
2016-06-29 09:41:06 -04:00 |
|
Brad Payne (Vir Linden)
|
7f904fbcbd
|
SL-124 - code cleanup
|
2016-06-27 08:48:15 -04:00 |
|
Brad Payne (Vir Linden)
|
b649847fe9
|
SL-124 - comment cleanup, fixed a crash if skinned mesh has no valid joint names defined
|
2016-06-24 16:43:23 -04:00 |
|
Brad Payne (Vir Linden)
|
3a53109152
|
SL-395 - support scale overrides (currently no way to get these into a dae, so the actual scale values are fabricated at run-time based on the joint name)
|
2016-06-07 10:39:32 -04:00 |
|
Brad Payne (Vir Linden)
|
18f21d657c
|
SL-315 - fixed collision volume scale issue in resetSkeleton()
|
2016-05-18 17:07:54 -04:00 |
|
Brad Payne (Vir Linden)
|
e8afa4c413
|
SL-315 - fixed collision volume scale issue in resetSkeleton()
|
2016-05-18 17:07:54 -04:00 |
|
Ansariel
|
f6e502b6ef
|
Merge bento-box
|
2016-05-18 20:34:55 +02:00 |
|
Brad Payne (Vir Linden)
|
182f2a4815
|
SL-315 - resetSkeleton(), working for bones at least partially, still some issues with collision volumes
|
2016-05-11 16:08:25 -04:00 |
|
Ansariel
|
5404f6382e
|
Merge bento-box
|
2016-04-23 12:01:35 +02:00 |
|
Brad Payne (Vir Linden)
|
70156605e2
|
SL-374 - don't allow sliders to modify joint positions if there's already a mesh-imposed override in place.
|
2016-04-22 14:51:57 -04:00 |
|
Ansariel
|
dd1a86c20c
|
Merge bento-box
|
2016-02-12 19:52:34 +01:00 |
|
Brad Payne (Vir Linden)
|
ef02c9ea69
|
SL-315 - context strings, comments, debugging. joint_test temporarily disabled.
|
2016-02-03 08:59:25 -05:00 |
|
Ansariel
|
546b276eba
|
Fix merge issue
|
2015-01-18 17:18:23 +01:00 |
|
Brad Payne (Vir Linden)
|
2cb14c7fdc
|
MAINT-4158 WIP - track position overrides requested by attachments so they can be undone intelligently
|
2014-08-28 17:32:22 -04:00 |
|
Stinson Linden
|
8392fde6f6
|
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365.
|
2014-06-02 22:32:16 +01:00 |
|
Stinson Linden
|
0160c514c5
|
MAINT-4077: Refactoring to add copy constructors to the LLVisualParam class and all of its derived descendants in order to clarify ownership of memory pointers.
|
2014-05-23 21:56:44 +01:00 |
|
Brad Payne (Vir Linden)
|
7b9708a2e3
|
sunshine-external merge WIP
|
2014-05-13 10:02:26 -04:00 |
|
Richard Linden
|
697d2e720b
|
renamed TimeBlock to BlockTimerStatHandle
|
2013-10-15 20:24:42 -07:00 |
|
Brad Payne (Vir Linden)
|
82f147367f
|
SH-3455 WIP - removing bake upload code
|
2013-09-19 11:10:59 -04:00 |
|
Richard Linden
|
cbe397ad13
|
changed fast timer over to using macro
another attempt to move mem stat into base class
|
2013-09-05 14:04:13 -07:00 |
|
Richard Linden
|
e340009fc5
|
second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
|
2013-08-09 17:11:19 -07:00 |