Commit Graph

108 Commits (5bfe6f57ae6242a8a28839fe6f9a143f29a03bb1)

Author SHA1 Message Date
Ansariel bfd99549b0 Merge branch 'release/2025.05' of https://github.com/secondlife/viewer
# Conflicts:
#	.github/pull_request_template.md
#	indra/llappearance/lltexlayer.cpp
#	indra/llcommon/llthread.cpp
#	indra/llprimitive/lldaeloader.cpp
#	indra/llprimitive/lldaeloader.h
#	indra/llprimitive/llmodel.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/llmodelpreview.cpp
#	indra/newview/lltoolpie.cpp
#	indra/newview/skins/default/xui/en/floater_model_preview.xml
#	indra/newview/skins/default/xui/en/panel_preferences_sound.xml
2025-07-18 14:14:54 +02:00
Ansariel 75db5e8b6b Revert "Fix LLCharacter base class constness." and restore improvements from 10a324a103 instead 2025-06-28 19:31:02 +02:00
Andrey Kleshchev 54660c8931 #4147 Joint Overrides #3
Remande skeleton translation from default skeleton to overriden skeleton
2025-06-13 21:49:02 +03:00
Andrey Kleshchev 8322a9a61e #4147 Joint Overrides #2 2025-06-12 15:55:47 +03:00
Andrey Kleshchev b20d10c0cc #4148 Skeleton Translation 2025-06-09 20:06:01 +03:00
Ansariel fef4f9a07e Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llappearance/llavatarappearance.h
#	indra/llcharacter/llcharacter.cpp
#	indra/llcharacter/llcharacter.h
#	indra/llcharacter/lljoint.cpp
#	indra/llcharacter/lljoint.h
#	indra/llimage/llimagedimensionsinfo.cpp
#	indra/llprimitive/lldaeloader.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelprofilepicks.cpp
#	indra/newview/llpanelprofilepicks.h
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvoavatarself.cpp
#	indra/newview/llvoavatarself.h
#	indra/newview/llwatchdog.cpp
#	indra/newview/llwatchdog.h
2025-05-03 15:45:54 +02:00
Ansariel Hiller 10a324a103
Reduce cost of joint lookups by reducing string allocations via use of std::string_view and heterogeneous map lookups (#3970) 2025-04-25 20:52:38 +03:00
Ansariel 8ba07f3165 Replace JointKey construct with more upstream-based approach, optimized by using std::string_view and heterogeneous map lookups 2025-04-24 19:26:55 +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
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 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 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 70f8dc7a4f miscellaneous: BOOL (int) to real bool 2024-02-12 23:17:22 +02:00
Ansariel a831237e29 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llimage/llimage.cpp
#	indra/llimage/llimage.h
#	indra/llkdu/llimagej2ckdu.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfavoritesbar.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llfloaterpreference.h
#	scripts/messages/message_template.msg.sha1
2024-02-06 17:58:20 +01:00
Alexander Gavriliuk 74c8b028d4 SL-20743 Use LLMutex in LLImageBase for internal data thread-safety 2023-12-21 19:12:52 +01: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 2fc942a75c Replace (at least) our use of boost::unordered_map with std::unordered_map 2023-12-04 13:42:09 +01: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 0ba281e843 Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer 2020-12-08 09:41:10 +01:00
Mnikolenko ProductEngine 792c086e91 SL-14369 Get rid of static sSkeletonXMLTree 2020-11-30 20:19:54 +02:00
Mnikolenko ProductEngine 0bd916d9ed SL-14369 FIXED BugSplat Crash LLAppViewer::cleanup() 2020-11-30 15:57:44 +02:00
Ansariel a0be0371d7 Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer 2020-11-12 01:12:13 +01:00
Andrey Kleshchev 5e7a0a963e SL-14190 moved sAvatarDictionary 2020-11-03 22:12:39 +02:00
Brad Payne (Vir Linden) 2d3b805b94 SL-10471 - collision volume api 2019-02-06 13:44:54 +00:00
Brad Payne (Vir Linden) b27ca1e68e SL-10471 - collision volume api 2019-02-06 13:44:54 +00:00
Ansariel 20494c8ee9 FIRE-23328: Improve extended script info by agent/group SLURLs & human-readable attachment point name 2018-12-03 23:39:14 +01:00
Ansariel 457d9792c0 Merge axon 2018-07-15 12:32:06 +02:00
Brad Payne (Vir Linden) d389f681b1 MAINT-8863 - more diagnostics to pin down possible causes 2018-07-12 18:10:19 +01:00
Ansariel b5b4b58cc0 Merge axon 2017-12-05 10:46:01 +01:00
Brad Payne (Vir Linden) 4b439ff968 SL-704 - made avatar hierarchy more consistent by adding lluiavatar for viewer-local avs used in upload previews 2017-12-04 11:15:47 +00:00
Ansariel 68a8141cd6 Merge bento-box 2016-10-04 12:49:38 +02:00
Brad Payne (Vir Linden) 801a628cc1 SL-451 - removed member variable that's no longer used with current joint numbering scheme 2016-09-29 09:59:50 -04:00
Ansariel ef3b8ad594 Merge bento-box 2016-09-28 14:45:26 +02:00
Brad Payne (Vir Linden) e6297ab3d6 SL-451 - support for getJoint() by number, use in initSkinningMatrixPalette() 2016-09-27 17:29:22 -04:00
Nicky 44ab8b8f4b Merge with firestorm-lgpl. 2016-09-17 19:35:49 +02:00