Ansariel
|
033fd2e476
|
Merge branch 'release/2024.08-DeltaFPS' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llcallstack.h
# indra/llcommon/llmemory.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvovolume.cpp
|
2024-08-27 18:33:30 +02:00 |
|
Cosmic Linden
|
316f0f0b8c
|
secondlife/viewer#2391: Remove avatar rigging "callstack" logging
|
2024-08-26 16:33:38 -07:00 |
|
Ansariel
|
dde5e9a8c1
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/newview/CMakeLists.txt
# indra/newview/llvoavatar.cpp
|
2024-08-10 14:38:13 +02:00 |
|
Alexander Gavriliuk
|
a6131b5652
|
#2229 BugSplat Crash #1502471: SecondLifeViewer!LLPolySkeletalDistortion::apply(196)
|
2024-08-09 14:05:55 +02:00 |
|
Ansariel
|
02680c6a8f
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/cmake/Boost.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llaudio/llaudiodecodemgr.cpp
# indra/llxml/llxmltree.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llfloaterworldmap.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llinventorygallerymenu.cpp
# indra/newview/llpanelgroup.cpp
# indra/newview/llpanelgroup.h
# indra/newview/llpanelprofile.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/viewer_manifest.py
|
2024-07-30 12:32:41 +02:00 |
|
Andrey Kleshchev
|
c4ff0b4889
|
viewer#2071 Properly handle 'out of memory' for meshes
|
2024-07-29 21:20:38 +03:00 |
|
Alexander Gavriliuk
|
5d25504f83
|
#2100 BugSplat Crash #1497210: LLVOAvatar::updateImpostors()(10616)
|
2024-07-29 19:50:28 +02:00 |
|
Ansariel
|
088cc2ea35
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llpointer.h
# indra/llcommon/llqueuedthread.cpp
# indra/llfilesystem/llfilesystem.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llstatgraph.cpp
# indra/llui/llvirtualtrackball.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelplaceprofile.cpp
# indra/newview/llstartup.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llvocache.cpp
# indra/newview/llworldmapview.cpp
|
2024-07-09 02:25:42 +02:00 |
|
Ansariel
|
9fdca96f8b
|
Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now
|
2024-07-08 20:27:14 +02: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 |
|
Ansariel
|
b42f9d836b
|
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 |
|
Ansariel
|
4ba5497928
|
Merge remote-tracking branch 'LL/DRTVWR-600-maint-A'
# Conflicts:
# FIRESTORM-SOURCE_LICENSE_HEADER.txt
# 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.h
# indra/llcommon/llprofiler.cpp
# indra/llimage/llimageworker.cpp
# indra/media_plugins/cef/dummy_volume_catcher.cpp
# indra/newview/CMakeLists.txt
# indra/newview/fsslurlcommand.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.h
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpreviewgesture.cpp
# indra/newview/llpreviewtexture.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/pieseparator.cpp
|
2024-05-22 23:53:27 +02: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
|
f0e4dcdaf6
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llthread.h
# indra/llmessage/llcachename.cpp
# indra/llui/lllineeditor.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llchatitemscontainerctrl.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llimprocessing.cpp
# indra/newview/llimview.cpp
# indra/newview/llnotificationhandlerutil.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltextureview.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
|
2024-05-08 05:10:22 +02:00 |
|
Alexander Gavriliuk
|
f9473e8afc
|
secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries
|
2024-05-07 10:18:51 +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 |
|
Alexander Gavriliuk
|
7d87e41bbd
|
secondlife/viewer#1331 The animation with null id is attempted to fetch
|
2024-04-28 18:27:50 +02:00 |
|
Ansariel
|
8cba216bd8
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llmutex.h
# indra/llinventory/llfoldertype.cpp
# indra/llmessage/llcachename.h
# indra/llmessage/llmessagetemplate.h
# indra/llmessage/llpartdata.h
# indra/llmessage/lltemplatemessagereader.cpp
# indra/llmessage/message.cpp
# indra/llrender/llgl.h
# indra/newview/llviewercontrol.cpp
|
2024-02-19 18:29:39 +01:00 |
|
Ansariel
|
321f283032
|
Replace remaining BOOL with bool llinventory and llmessage
|
2024-02-19 18:06:08 +02: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 |
|
Ansariel
|
088f2f4f65
|
More BOOL to bool replacements primarily in llappearance and llxml
|
2024-02-17 20:45:34 +02: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
|
0c363cab11
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
|
2023-12-12 12:58:05 +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
|
356ac7b5bb
|
Possible crash fix
|
2023-12-04 11:19:32 +01:00 |
|
Ansariel
|
c58a1544bc
|
Merge branch 'DRTVWR-591-maint-X' of H:/ViewerDev/viewer-591
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewerparceloverlay.h
|
2023-11-30 19:31:04 +01:00 |
|
Alexander Gavriliuk
|
110eb2c989
|
SL-20442 Add an 'Until shortcut key released' option to gestures so we can do properly user-mappable keys
|
2023-11-24 17:41:23 +01:00 |
|
Ansariel
|
866e71d1f8
|
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llui/lllineeditor.cpp
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/llappearancemgr.cpp
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/lltoastalertpanel.cpp
# indra/newview/skins/default/xui/en/floater_preview_gesture.xml
# indra/newview/skins/default/xui/en/panel_group_general.xml
# indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
# indra/newview/skins/default/xui/en/strings.xml
|
2023-10-21 13:52:40 +02:00 |
|
Kyler Eastridge
|
02ca44eea5
|
[BUG-234493] Add "Until key release" to the gesture "Wait"
|
2023-10-19 01:26:43 +03:00 |
|
Ansariel
|
5dd820c22d
|
Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
|
2023-07-29 14:35:11 +02:00 |
|
Andrey Kleshchev
|
bc3f2d53d1
|
SL-19891 Make sure focusable elements clear focus on destruction
|
2023-07-18 01:56:42 +03:00 |
|
Ansariel
|
f00f624b8b
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# doc/contributions.txt
# indra/llcommon/llerrorthread.cpp
|
2023-07-18 00:45:10 +02:00 |
|
Andrey Lihatskiy
|
07ff9a5d67
|
Merge branch 'main' into DRTVWR-582-maint-U
# Conflicts:
# doc/contributions.txt
# indra/llcommon/llerrorthread.cpp
|
2023-07-17 23:17:29 +03:00 |
|
Ansariel
|
75b2ac651a
|
Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer
|
2023-05-31 10:36:37 +02:00 |
|
Andrey Lihatskiy
|
b9cd6e2e84
|
Merge branch 'xcode-14.3' into DRTVWR-582-maint-U
# Conflicts:
# indra/llcommon/llsdserialize.h
|
2023-05-26 06:15:49 +03:00 |
|
Ansariel
|
e900da3597
|
Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcommon/llerrorthread.cpp
# indra/llui/lllayoutstack.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfilepicker.cpp
|
2023-05-23 13:57:36 +02:00 |
|
Andrey Lihatskiy
|
a10c876ae4
|
DRTVWR-580 Post-merge fix
|
2023-05-19 02:20:48 +03:00 |
|
Ansariel
|
0f01fce98c
|
Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
|
2023-05-18 14:33:59 +02:00 |
|
Ansariel
|
1d28a79ec6
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# doc/contributions.txt
# indra/llcharacter/llkeyframemotion.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfilepicker.cpp
|
2023-05-18 13:43:48 +02:00 |
|
Andrey Lihatskiy
|
4dcab10bf8
|
Merge branch 'main' into DRTVWR-580-maint-T
# Conflicts:
# doc/contributions.txt
# indra/llcharacter/llkeyframemotion.cpp
# indra/newview/llfilepicker.cpp
|
2023-05-17 17:47:45 +03:00 |
|
Ansariel
|
cffd703135
|
Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/newview/llvoicevivox.cpp
|
2023-04-21 19:43:30 +02:00 |
|
Ansariel
|
da32456165
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-contribute
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/llcommon/tests/llleap_test.cpp
# indra/newview/skins/default/xui/en/strings.xml
|
2023-04-21 12:38:19 +02:00 |