050d2fefab
Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/gltf/primitive.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvovolume.cpp
2024-06-13 03:21:12 +02:00
c29a661b22
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600
...
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llglslshader.cpp
# indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl
# indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
# indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl
# indra/newview/gltf/accessor.cpp
# indra/newview/gltf/accessor.h
# indra/newview/gltf/animation.h
# indra/newview/gltf/asset.cpp
# indra/newview/gltf/primitive.cpp
# indra/newview/gltf/primitive.h
# indra/newview/gltfscenemanager.h
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llimprocessing.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2024-06-13 01:54:18 +02:00
7c42711ca3
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development
2024-06-10 16:22:12 -07:00
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
07e1d7bf7f
Fix macOS build error
2024-06-01 16:31:34 +02:00
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
9f6849e081
Merge remote-tracking branch 'origin/project/gltf_development' into brad/merge-maint-a-to-dev
2024-05-23 11:35:23 -07:00
ea5ead6f4a
Merge remote-tracking branch 'FS600/master'
...
# Conflicts:
# doc/contributions.txt
# indra/llimage/tests/llimageworker_test.cpp
# indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
2024-05-23 18:15:07 +02:00
c203bb650a
Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/app_settings/settings.xml
# indra/newview/llinventorymodel.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/notifications.xml
2024-05-23 01:48:45 +02:00
e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
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
03c4458bdc
#1392 GLTF Upload ( #1394 )
...
* #1392 WIP -- Functional texture upload, stubbed out .bin upload.
* #1392 GLTF Upload WIP -- Emulates successful upload
Successfully uploads texture
Emulates successful .gltf and .bin upload by injecting into local asset cache.
Emulates rez from inventory by setting sculpt ID of selected object
Currently fails in tinygltf parsing due to missing .bin
* Add missing notification
* Build fix
* #1392 Add boost::json .gltf reading support.
* #1392 boost::json GLTF writing prototype
* Create gltf/README.md
* Update README.md
* Update README.md
* Update README.md
* Update README.md
* Update README.md
* #1392 Add ability to render directly from LL::GLTF::Material
* Fix for mac build
* Mac build fix
* #1392 AssetType and Inventory Type plumbing
* #1392 More sane error handling and scheduling of uploads.
* #1392 Actually attempt to upload glbin
* Mac build fix, upload nudge
* Mac build fix
* Fix glTF asset uploads to server
* Mac build fix (inline not static)
* More consistent inline
* Add glm, mac nudge.
* #1392 For consistency with spec, start using glm over glh:: and LLFoo
* Another attempt at placating Mac builds
* Another Mac nudge
* Mac build take 23
* #1392 Prune LLMatrix4a from GLTF namespace.
* #1392 Fix for orientation being off (glm::quat is wxyz, not xyzw)
* #1392 WIP -- Actually send the sculpt type and id, nudge readme and alpha rendering
* #1392 Working download!
* #1394 Add support for GLTFEnabled SimulatorFeature
* #1392 Review feedback
---------
Co-authored-by: Pepper Linden <3782201+rohvani@users.noreply.github.com>
2024-05-20 13:22:55 -05:00
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
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
f9473e8afc
secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries
2024-05-07 10:18:51 +02:00
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
38c2a5bde9
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
2024-05-01 08:16:58 +03:00
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
b527620dfc
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-04-24 19:53:03 +02:00
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
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
428f21cf79
Merge branch 'main' into marchcat/x-merge
2024-04-24 18:45:54 +03:00
9b30bc68c1
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/fix-incredibuild.py
# indra/newview/app_settings/settings.xml
# indra/newview/llcontrolavatar.cpp
# indra/newview/lloutfitslist.cpp
2024-04-12 19:36:23 +02:00
50a70fe2f8
viewer#1073 crash at loadSkeleton
...
looks like file that was being parced got corrupted 'in progress'
2024-03-28 20:38:15 +02:00
b71c7f37ea
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llagent.cpp
# indra/newview/llagent.h
# indra/newview/llagentcamera.cpp
# indra/newview/llagentcamera.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llattachmentsmgr.cpp
# indra/newview/llattachmentsmgr.h
# indra/newview/llavataractions.cpp
# indra/newview/llcallingcard.cpp
# indra/newview/llcompilequeue.cpp
# indra/newview/llcontrolavatar.h
# indra/newview/lldirpicker.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolalpha.h
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfasttimerview.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfloateravatarpicker.cpp
# indra/newview/llfloaterbeacons.cpp
# indra/newview/llfloaterbvhpreview.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloaterchangeitemthumbnail.cpp
# indra/newview/llfloaterdisplayname.cpp
# indra/newview/llfloatergotoline.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterland.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
# indra/newview/llfloaterscriptdebug.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llfloatertools.cpp
# indra/newview/llfloatertools.h
# indra/newview/llfloateruipreview.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llgesturemgr.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llhudeffectlookat.cpp
# indra/newview/llhudeffectlookat.h
# indra/newview/llhudicon.cpp
# indra/newview/llhudmanager.cpp
# indra/newview/llhudtext.cpp
# indra/newview/llhudtext.h
# indra/newview/llimprocessing.cpp
# indra/newview/llimview.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorymodel.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/lllocalbitmaps.cpp
# indra/newview/lllogininstance.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llmodelpreview.h
# indra/newview/llmutelist.cpp
# indra/newview/llnavigationbar.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
# indra/newview/llnotificationlistitem.cpp
# indra/newview/lloutputmonitorctrl.cpp
# indra/newview/llpanelcontents.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelexperiencepicker.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelgroup.cpp
# indra/newview/llpanelgroupnotices.cpp
# indra/newview/llpanelgrouproles.cpp
# indra/newview/llpanellandaudio.cpp
# indra/newview/llpanellandmarks.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelobject.cpp
# indra/newview/llpanelobject.h
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelplaces.cpp
# indra/newview/llpanelpresetspulldown.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelsnapshot.h
# indra/newview/llpanelvolume.cpp
# indra/newview/llpanelwearing.cpp
# indra/newview/llpreviewanim.cpp
# indra/newview/llpreviewgesture.cpp
# indra/newview/llpreviewnotecard.cpp
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewscript.h
# indra/newview/llpreviewtexture.cpp
# indra/newview/llpreviewtexture.h
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llsnapshotlivepreview.cpp
# indra/newview/llstartup.cpp
# indra/newview/llstatusbar.cpp
# indra/newview/llsurface.h
# indra/newview/llsurfacepatch.cpp
# indra/newview/lltexturecache.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/lltoastimpanel.cpp
# indra/newview/lltoolbarview.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/lltoolface.cpp
# indra/newview/lltoolfocus.cpp
# indra/newview/lltoolgrab.cpp
# indra/newview/lltoolgun.cpp
# indra/newview/lltoolgun.h
# indra/newview/lltoolpie.cpp
# indra/newview/lltoolplacer.cpp
# indra/newview/lltoolselect.cpp
# indra/newview/lluploaddialog.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llvieweraudio.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerfoldertype.cpp
# indra/newview/llviewerinput.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewermenu.h
# indra/newview/llviewermenufile.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobject.h
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewerobjectlist.h
# indra/newview/llviewerparcelmgr.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerregion.h
# indra/newview/llviewershadermgr.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexlayer.h
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewertexturelist.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvoavatarself.h
# indra/newview/llvoiceclient.h
# indra/newview/llvosky.cpp
# indra/newview/llvosurfacepatch.cpp
# indra/newview/llvotree.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvovolume.h
# indra/newview/llvowater.cpp
# indra/newview/llworld.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/llworldmipmap.cpp
# indra/newview/pipeline.cpp
2024-02-22 11:43:04 +01:00
60d3dd98a4
Convert remaining BOOL to bool
2024-02-21 23:14:31 +02:00
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
2b31dad400
miscellaneous: BOOL (int) to real bool
2024-02-12 23:17:22 +02:00
b9a2c8279f
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
2024-01-09 10:54:50 +01:00
0a292ab51d
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
2024-01-09 10:21:07 +01:00
fee385247e
Merge branch 'main' into DRTVWR-594-maint-Y
2024-01-08 23:16:14 +02:00
afe91b7eb6
Merge main (DRTVWR-596 GLTF Materials Maint) into DRTVWR-591-maint-X
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
2024-01-08 21:33:06 +02:00
e341621a8e
Merge branch 'DRTVWR-594-maint-Y' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llmemory.cpp
# indra/llui/lltooltip.cpp
# indra/newview/llagent.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
# indra/newview/skins/default/xui/en/notifications.xml
2023-12-27 13:00:20 +01:00
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
1aebbd397b
SL-20682 renaming of folders seems to fail (but doesn't really)
2023-12-07 21:49:51 +01:00
9f3edb90d4
SL-20181 Minor inventory fetching adjustements
2023-12-06 01:02:42 +02:00
f4307bed26
SL-20181 Don't force fetch if vesion is unknown
2023-12-06 01:02:42 +02:00
4275b1ade8
Merge branch 'DRTVWR-596' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodel.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llviewermenufile.cpp
# indra/newview/skins/default/xui/en/floater_snapshot.xml
2023-12-03 14:56:30 +01:00
361efcb926
Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into DRTVWR-596
2023-11-15 10:32:18 -06:00
0d50f29697
SL-20553: Fix inventory item not updating with correct permission label in UI
2023-11-09 13:54:42 -08:00
aa7c8eeaef
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llprofiler.h
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llinventorymodel.cpp
# indra/newview/llstartup.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
2023-11-07 11:56:19 +01:00
afa45530f7
SL-19968 disabled pump_idle_network for now due to it causing several failures during login
...
also added suggested continue statements, and removed obsolete
LLInventoryItem::fromLLSD deserialization codepath.
2023-11-06 14:30:33 -08:00
dfb44aec70
Fix build error from overly fancy tracy macro usage that nobody else is using for DRTVWR-559
2023-11-03 09:50:03 -07:00
b9b38db567
Fix for SL-19968 objects missing timing bug due to stall during login
...
ensure inventory skeleton loading doesn't block the message system from processing packets.
2023-11-03 09:49:48 -07:00
eeeeefadb7
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-10-11 11:25:27 +02:00
271ed0f28a
What's this???
2023-10-05 11:20:33 +02:00
9636801773
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llinventorymodel.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewerinventory.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
2023-10-04 12:28:33 +02:00
0a928bf1fd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llagent.cpp
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llsidepaneltaskinfo.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llviewerinventory.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
2023-10-04 11:38:21 +02:00
5566f28b03
D559 Post merge fixes
2023-10-03 20:13:23 +03:00
7d50a51434
Merge branch 'main' (DRTVWR-567) into DRTVWR-559
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llagent.cpp
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llsidepaneltaskinfo.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llviewerinventory.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
# indra/newview/skins/default/xui/en/menu_inventory.xml
2023-10-03 19:00:33 +03:00
Ansariel