Ansariel
|
346b8e0410
|
Fix a bunch of XUI parser warnings
|
2024-07-26 15:12:41 +02:00 |
|
Ansariel
|
9e0164e4fc
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llui/llconsole.cpp
# indra/llui/llcontainerview.cpp
# indra/llui/llcontainerview.h
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpaneloutfitedit.cpp
# indra/newview/llpaneloutfitedit.h
# indra/newview/llpanelpeople.cpp
# indra/newview/llwearableitemslist.cpp
# indra/newview/llworldmapview.cpp
|
2024-07-26 14:28:51 +02:00 |
|
Andrey Kleshchev
|
8ae0e6c07a
|
viewer#2102 Update feature notification to notify about Favorites
and remove old notifications
|
2024-07-26 13:43:20 +03:00 |
|
Rye Mutt
|
543dbfee49
|
Reduce findChild stalls in face panel
|
2024-07-25 23:26:52 -04: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
|
684bc1d1ea
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/llcommon/llsys.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindow.h
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/logcontrol.xml
# indra/newview/llappviewerwin32.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llspeakers.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvocache.cpp
# indra/newview/llvoicechannel.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoiceclient.h
# indra/newview/llvoicevivox.cpp
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
# indra/newview/viewer_manifest.py
# scripts/messages/message_template.msg.sha1
|
2024-06-21 19:46:51 +02:00 |
|
Ansariel
|
15b3c9f164
|
Fix a few merge issues
|
2024-06-13 02:22:03 +02:00 |
|
Ansariel
|
1bbe697db7
|
Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llappearance/llavatarappearance.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvocache.cpp
|
2024-06-11 14:38:20 +02:00 |
|
Brad Linden
|
40197e8949
|
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development
|
2024-06-06 09:46:53 -07:00 |
|
Andrey Kleshchev
|
e60adafa33
|
viewer#1641 Show accurate Alpha mode if asset is missing
|
2024-06-06 15:27:10 +03:00 |
|
Brad Linden
|
a1f49564d6
|
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev
|
2024-05-23 11:31:19 -07:00 |
|
Ansariel
|
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 |
|
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 |
|
Andrey Lihatskiy
|
b06a99f7c7
|
Post-merge spaces fix
|
2024-05-15 12:47:27 +03:00 |
|
Ansariel
|
508ab2df1c
|
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llimage/llimage.h
# 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.h
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llmaniprotate.cpp
# indra/newview/llmaniptranslate.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/llviewerdisplay.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
|
2024-05-10 12:40:19 +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 |
|
Dave Parks
|
155ddf2336
|
Merge pull request #1421 from secondlife/DRTVWR-600-maint-A
Drtvwr 600 maint a
|
2024-05-07 09:47:37 -05:00 |
|
Alexander Gavriliuk
|
f9473e8afc
|
secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries
|
2024-05-07 10:18:51 +02:00 |
|
RunitaiLinden
|
c6d752b880
|
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge
|
2024-05-06 16:48:58 -05: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
|
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 |
|
Ansariel
|
8f5bd7ee57
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2024-04-16 20:37:06 +02:00 |
|
Beq
|
ca9ab7b17d
|
Merge branch 'master' into new_texture_edit_panel
|
2024-04-07 22:16:35 +01:00 |
|
Ansariel
|
00163d131a
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterchangeitemthumbnail.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llvovolume.cpp
|
2024-03-27 14:17:09 +01:00 |
|
Andrey Lihatskiy
|
71ed19839e
|
Merge branch 'main' into DRTVWR-600-maint-A
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterchangeitemthumbnail.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llvovolume.cpp
|
2024-03-27 00:45:06 +02:00 |
|
Ansariel
|
4882ed24e8
|
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llvlcomposition.cpp
# indra/newview/skins/default/xui/en/notifications.xml
|
2024-03-23 13:18:33 +01:00 |
|
Cosmic Linden
|
d0458c4853
|
secondlife/viewer#1006: Move blank material constant to indra_constants.h
|
2024-03-18 13:57:01 -07:00 |
|
Ansariel
|
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 |
|
Ansariel
|
60d3dd98a4
|
Convert remaining BOOL to bool
|
2024-02-21 23:14:31 +02:00 |
|
Ansariel
|
314639426d
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llui/llchat.h
# indra/llui/llcombobox.cpp
# indra/llui/llcontainerview.h
# indra/llui/llfloater.cpp
# indra/llui/llfloater.h
# indra/llui/llfolderview.cpp
# indra/llui/lllineeditor.cpp
# indra/llui/llmenugl.cpp
# indra/llui/llmultifloater.cpp
# indra/llui/llmultifloater.h
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llscrolllistctrl.h
# indra/llui/llspinctrl.cpp
# indra/llui/llspinctrl.h
# indra/llui/lltabcontainer.cpp
# indra/llui/lltabcontainer.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llui/llview.h
# indra/llui/llviewereventrecorder.cpp
# indra/llxml/llcontrol.cpp
# indra/llxml/llcontrol.h
# indra/newview/llagentlanguage.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llavatarlistitem.cpp
# indra/newview/llavatarlistitem.h
# indra/newview/llchatitemscontainerctrl.cpp
# indra/newview/llchicletbar.cpp
# indra/newview/llfloaterbuildoptions.cpp
# indra/newview/llfloaterbuildoptions.h
# indra/newview/llfloaterbump.cpp
# indra/newview/llfloaterbump.h
# indra/newview/llfloaterconversationpreview.h
# indra/newview/llfloaterdestinations.h
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloaterjoystick.cpp
# indra/newview/llfloaterland.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llfloaterpay.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreference.h
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterscriptdebug.cpp
# indra/newview/llfloaterscriptdebug.h
# indra/newview/llfloaterscriptedprefs.cpp
# indra/newview/llfloatersearch.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatertools.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llmediactrl.h
# indra/newview/llmoveview.cpp
# indra/newview/llnavigationbar.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llnetmap.cpp
# indra/newview/llnotificationlistitem.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelgroup.cpp
# indra/newview/llpanelgroupnotices.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llpanelobject.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llpanelpermissions.h
# indra/newview/llpanelprofileclassifieds.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelsnapshot.h
# indra/newview/llpanelsnapshotinventory.cpp
# indra/newview/llpanelsnapshotlocal.cpp
# indra/newview/llpanelsnapshotpostcard.cpp
# indra/newview/llpreviewnotecard.h
# indra/newview/llstartup.cpp
# indra/newview/llstatusbar.cpp
# indra/newview/llstatusbar.h
# indra/newview/llsyswellwindow.h
# indra/newview/lltexturectrl.h
# indra/newview/lltoolbarview.cpp
# indra/newview/lltoolselect.cpp
# indra/newview/llwearableitemslist.cpp
|
2024-02-21 13:07:42 +01:00 |
|
Ansariel
|
a5261a5fa8
|
Convert BOOL to bool in llui
|
2024-02-21 03:00:25 +02:00 |
|
Ansariel
|
e1d9ce6970
|
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-601
|
2024-02-11 19:47:44 +01:00 |
|
Ansariel
|
86230977c4
|
Merge branch 'release/gltf-maint2' of https://github.com/secondlife/viewer
# Conflicts:
# README.md
|
2024-02-11 19:46:50 +01:00 |
|
Brad Linden
|
846337483c
|
Merge branch 'release/materials_featurette' into release/gltf-maint2
|
2024-02-09 09:47:19 -08:00 |
|
Ansariel
|
661380f74c
|
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-601
|
2024-02-05 11:41:10 +01:00 |
|
Andrey Kleshchev
|
8075cf04c4
|
Issue #26 Support texture drop onto PBR materials
|
2024-02-02 23:51:56 +02:00 |
|
RunitaiLinden
|
9c378ca1e7
|
Merge pull request #703 from secondlife/release/gltf-maint2
Release/gltf maint2
|
2024-01-30 15:49:35 -06:00 |
|
Andrey Kleshchev
|
3b9a1a44b3
|
SL-20669 Fix missed uuid
|
2024-01-26 17:37:10 +02:00 |
|
Ansariel
|
62ffcf193d
|
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llpanelface.h
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_tools.xml
|
2024-01-26 13:17:18 +01:00 |
|
Ansariel
|
23edfd0bfa
|
Merge branch 'release/gltf-maint2' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
|
2024-01-25 20:39:44 +01:00 |
|
Jonathan "Geenz" Goodman
|
373b06398c
|
Merge remote-tracking branch 'origin/release/materials_featurette' into DRTVWR-583
|
2024-01-24 14:37:33 -08:00 |
|
Andrey Kleshchev
|
869712e273
|
SL-20669 Move constants out of settings.xml
UIImgInvisibleUUID doesn't exist
Default normal for material is 'null'
|
2024-01-24 17:40:01 +02:00 |
|
Ansariel
|
c7a44ac88b
|
Merge branch 'DRTVWR-601' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/lltexturectrl.h
|
2024-01-17 11:04:36 +01:00 |
|
Andrey Kleshchev
|
390a5031dc
|
SL-19555 Fix picker failing to highlight default material in inventory
|
2024-01-10 01:43:36 +02:00 |
|
Ansariel
|
cd4883fccc
|
Merge branch 'DRTVWR-601' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/skins/default/xui/en/strings.xml
|
2024-01-09 11:30:13 +01:00 |
|
Zi Ree
|
a28b388a9d
|
Merge branch 'master' into new_texture_edit_panel
Merge with master
|
2024-01-08 22:40:46 +01:00 |
|
Zi Ree
|
8e4136292e
|
Created branch for the new texture edit panel
|
2024-01-07 23:44:43 +01:00 |
|
Andrey Kleshchev
|
4392f1bc8f
|
SL-20748 Fix library materials not being previewable on an object
|
2024-01-05 20:03:14 +02:00 |
|
Ansariel
|
6f49b2609e
|
Merge branch 'DRTVWR-596' of https://github.com/secondlife/viewer
|
2023-12-15 23:36:05 +01:00 |
|
Ansariel
|
8f27305e5d
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
|
2023-12-15 23:35:39 +01:00 |
|
Andrey Kleshchev
|
1b1457154d
|
SL-20715 Mask cutoff not copied corretly in build tools
|
2023-12-14 18:19:00 +02:00 |
|
Andrey Kleshchev
|
2d3b52d02e
|
SL-20715 Mapping mode and specular color not copied correctly
and fixed diffuse alpha
|
2023-12-13 12:53:19 +02:00 |
|
Ansariel
|
48c1225f9b
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2023-12-12 12:20:02 +01:00 |
|
Ansariel
|
2c4576f818
|
FIRE-33497: Fix specular color not copied when copy/pasting texture parameters
|
2023-12-11 13:24:08 +01:00 |
|
Ansariel
|
f83afbc368
|
Merge branch 'DRTVWR-596' of https://github.com/secondlife/viewer
|
2023-12-09 15:00:12 +01:00 |
|
Maxim Nikolenko
|
7398efb1f4
|
SL-20701 FIXED Build tool texture tab shows incorrect material parameters in some cases
|
2023-12-08 20:15:47 +02:00 |
|
Ansariel
|
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 |
|
Maxim Nikolenko
|
88aefc95ea
|
SL-20655 FIXED Texture permissions not enforced in Material floaters
|
2023-11-30 17:47:46 +02:00 |
|
Maxim Nikolenko
|
b96ca755b3
|
SL-20647 don't allow dragging 'no mod' material into the picker of an attached object
|
2023-11-29 16:46:10 +02:00 |
|
Cosmic Linden
|
ba1f87b36e
|
SL-20553: Fix crash in ~PBRPickerAgentListener
|
2023-11-17 13:26:08 -08:00 |
|
Cosmic Linden
|
711354c2f5
|
SL-20553: Save material button in build floater now depends on agent inventory rather than object inventory
|
2023-11-09 13:54:41 -08:00 |
|
Ansariel
|
456b7f9ba7
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llselectmgr.cpp
|
2023-11-01 13:46:17 +01:00 |
|
Maxim Nikolenko
|
e154fee226
|
SL-20541 Reorder radio buttons in Edit tools Texture tab to match order in a Material
|
2023-10-30 16:40:04 +02:00 |
|
Ansariel
|
c12c377c61
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
|
2023-10-01 18:18:17 +02:00 |
|
Jonathan "Geenz" Goodman
|
32bfafca4d
|
Merge branch 'DRTVWR-559' into DRTVWR-583
|
2023-09-29 04:34:12 -07:00 |
|
Andrey Kleshchev
|
1b493d5690
|
SL-20343 Material floater was disconnected from object's face
|
2023-09-28 03:55:43 +03:00 |
|
Maxim Nikolenko
|
6e32993c87
|
SL-20338 FIXED Texture tab Material drop-down does not change if same numbered face is selected
|
2023-09-26 13:59:31 +03:00 |
|
Jonathan "Geenz" Goodman
|
73870cb0b4
|
Merge branch 'DRTVWR-559' into DRTVWR-583
|
2023-09-25 09:27:49 -07:00 |
|
Ansariel
|
4532e17e3d
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llpanelface.cpp
|
2023-09-20 15:07:19 +02:00 |
|
Andrey Kleshchev
|
97ee8b207b
|
SL-5522 Fix applying textuers and materials with limited restrictions to attachments
1. Texture picker now updates filter's permissions based on selection
2. Various panels now properly check permissions
|
2023-09-19 01:01:43 +03:00 |
|
Jonathan "Geenz" Goodman
|
4192cfc1ea
|
Merge branch 'DRTVWR-559' into DRTVWR-583
|
2023-09-09 14:52:06 -07:00 |
|
Ansariel
|
9c338b3167
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llpanelface.cpp
|
2023-09-07 15:47:51 +02:00 |
|
Cosmic Linden
|
ab66df94cb
|
SL-20167: Also check permission on paste to be certain
|
2023-09-06 11:02:31 -07:00 |
|
Cosmic Linden
|
05c8ef3f3c
|
SL-20167: Grey out the clipboard when copying the material to clipboard is not allowed
|
2023-09-01 17:36:00 -07:00 |
|
Jonathan "Geenz" Goodman
|
c5bfe86915
|
Merge branch 'DRTVWR-559' into DRTVWR-583
|
2023-08-29 03:40:10 -07:00 |
|
Jonathan "Geenz" Goodman
|
fbecd348f8
|
Add protocol level mirror support, and UI.
|
2023-08-29 03:04:04 -07:00 |
|
Ansariel
|
402595346b
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/installers/windows/installer_template.nsi
|
2023-08-24 20:50:27 +02:00 |
|
Andrey Kleshchev
|
ef33902f22
|
SL-20145 GLTF specific feature notification
|
2023-08-21 19:51:04 +03:00 |
|
Ansariel
|
fdee1057aa
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
|
2023-08-19 13:14:50 +02:00 |
|
Ansariel
|
dc42a2b8c7
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llpanelface.cpp
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
|
2023-08-14 21:21:19 +02:00 |
|
Cosmic Linden
|
466914e122
|
SL-20024: Double-check object inventory is not pending when save button pressed
|
2023-08-11 17:18:06 -07:00 |
|
Cosmic Linden
|
6c8ced0edd
|
SL-20024: Show loading message when inventory permissions are loading
|
2023-08-11 16:31:01 -07:00 |
|
Cosmic Linden
|
27842d0c5f
|
SL-20024: Fix material edit/save buttons on build floater sometimes not re-enabling after object inventory load
|
2023-08-11 16:31:00 -07:00 |
|
Cosmic Linden
|
a5d318567c
|
SL-20024: (WIP) (untested) Fix GLTF material permissions in some more edge cases
|
2023-08-11 16:31:00 -07:00 |
|
Cosmic Linden
|
7bf6103ad9
|
SL-20024: (WIP) (not tested) Improved behavior for saving material to inventory. Check perms, keep perms.
|
2023-08-11 16:31:00 -07:00 |
|
Cosmic Linden
|
a4030031f8
|
SL-20024: Do not show material preview for no-modify materials
|
2023-08-11 16:30:59 -07:00 |
|
Cosmic Linden
|
e7e565dc6e
|
SL-20024: Put material in object inventory when material is no-modify or no-transfer
|
2023-08-11 16:30:49 -07:00 |
|
Ansariel
|
fb7d8e2bc1
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
|
2023-08-11 11:24:23 +02:00 |
|
Andrey Kleshchev
|
d8e4572b90
|
SL-20039 "Save to inventory" should only allow saving identical faces
|
2023-08-10 21:29:36 +03:00 |
|
Andrey Kleshchev
|
87c00d8daa
|
SL-20133 Shift clicking selected face leaves Editor's Texture tab in a weird state
|
2023-08-10 17:01:47 +03:00 |
|
Ansariel
|
ed67ca001c
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/logcontrol.xml
# indra/newview/app_settings/settings.xml
# indra/newview/llpanelface.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
|
2023-08-09 11:05:56 +02:00 |
|
Maxim Nikolenko
|
4705515e78
|
SL-19303 switch automatically between Materials/PBR/Media based on current values
|
2023-08-03 20:29:30 +03:00 |
|
Jonathan "Geenz" Goodman
|
f4a6a434fa
|
Merge branch 'DRTVWR-559' into DRTVWR-583
|
2023-07-31 02:38:13 -07: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 |
|
Andrey Kleshchev
|
5e344813dc
|
SL-18396 PBR and blinn phong should not be allowed to be edited together
|
2023-07-27 23:26:46 +03:00 |
|
Ansariel
|
e85546fc3d
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# doc/contributions.txt
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llpanelface.cpp
# indra/newview/skins/default/xui/en/notifications.xml
|
2023-07-18 11:17:02 +02:00 |