Hecklezz
|
f479ed8757
|
[FIRE-36028] Fix OpenSim object permissions
|
2025-10-21 05:11:28 +10:00 |
|
Maxim Nikolenko
|
6e2a86f6b9
|
#4772 fix group ownership detection for deeded objects (FS:TJ- Fixes issue FIRE-35983)
|
2025-10-10 04:27:49 +10:00 |
|
Ansariel
|
0871a8ed4a
|
Merge branch 'release/2025.06' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llui/llurlentry.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llvoavatar.cpp
|
2025-08-06 19:07:19 +02:00 |
|
Ansariel
|
539959a7f8
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop
# Conflicts:
# .github/workflows/qatest.yaml
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llwearableitemslist.cpp
|
2025-08-06 18:47:44 +02:00 |
|
Andrey Kleshchev
|
ce9d66cdd1
|
Merge branch develop into 2025.06
# Conflicts:
# indra/newview/llvoavatar.cpp
|
2025-08-06 16:05:19 +03:00 |
|
Andrey Kleshchev
|
3b8b408b90
|
#3969 Make inventory creation from cache faster
Still has a lot of space for improvements, but should be 2.5 times faster
|
2025-07-28 11:48:53 +03:00 |
|
Ansariel
|
7d03d5af2a
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2025-07-09 22:50:15 +02:00 |
|
Ansariel
|
c4333e2222
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llinventory/llsettingssky.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/skins/default/xui/en/floater_world_map.xml
|
2025-06-16 12:55:12 +02:00 |
|
Ansariel
|
b7063272ff
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
|
2025-06-16 12:46:50 +02:00 |
|
Ansariel
|
3f4d28329f
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2025-06-15 17:58:08 +02:00 |
|
Hecklezz
|
9dab6cb238
|
Fixed adding skies to day cycle by ensuring mAbsorptionConfigs, mMieConfigs and mRayleightConfigs don't become null
|
2025-06-12 02:31:38 +10:00 |
|
Hecklezz
|
86a8f5a558
|
Fixed adding skies to day cycle by ensuring mAbsorptionConfigs, mMieConfigs and mRayleightConfigs don't become null
|
2025-06-10 21:47:56 +03:00 |
|
Ansariel
|
4cfdea8395
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/newview/skins/default/xui/zh/strings.xml
|
2025-06-07 17:50:44 +02:00 |
|
Hecklezz
|
4b40399d3f
|
Adds missing ambient color blending to day cycle
|
2025-06-03 01:49:29 +10:00 |
|
Hecklezz
|
6291e86bf2
|
Adds missing ambient color blending to day cycle
|
2025-06-02 16:48:44 +03:00 |
|
Ansariel
|
159c05a5ac
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
# Conflicts:
# .github/workflows/qatest.yaml
# indra/newview/skins/default/xui/ja/strings.xml
|
2025-05-30 13:26:29 +02:00 |
|
Ansariel
|
7b770b1786
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
# Conflicts:
# .github/workflows/qatest.yaml
# indra/llcommon/llsdutil.h
# indra/newview/llinventorybridge.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitgallery.h
# indra/newview/skins/default/xui/ja/strings.xml
|
2025-05-29 12:34:42 +02:00 |
|
Beq
|
aa1c1cb874
|
import [#4185] Fix sky ambient color not blending during day cycle
|
2025-05-29 00:35:33 +01:00 |
|
Andrey Lihatskiy
|
b08ba3fa7b
|
Merge branch 'main' into marchcat/2505-merge
# Conflicts:
# .github/workflows/qatest.yaml
# indra/llcommon/llsdutil.h
# indra/llui/llflatlistview.h
# indra/newview/llinventorybridge.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitgallery.h
|
2025-05-28 21:38:00 +03:00 |
|
Jonathan "Geenz" Goodman
|
fe4f85e587
|
Merge remote-tracking branch 'origin/main' into geenz/2025.04-to-develop
|
2025-05-28 11:52:16 -04:00 |
|
Ansariel
|
1513d97e55
|
Merge branch 'release/2025.05' of https://github.com/secondlife/viewer
# Conflicts:
# .github/workflows/qatest.yaml
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewerinventory.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/skins/default/xui/en/floater_inventory_settings.xml
|
2025-05-23 12:44:50 +02:00 |
|
Maxim Nikolenko
|
2cbff073ed
|
#4000 Cherry pick inventory LEAP functions from develop branch
|
2025-05-20 20:40:04 +03:00 |
|
Andrey Kleshchev
|
3de223aecf
|
#1300 Test coverage for inventory metadata
For now it's random, needs more consistent coverage
|
2025-05-05 18:28:08 +03:00 |
|
Andrey Kleshchev
|
f73e0d09aa
|
#3905 Crashes in LLInventoryModel::saveToFile
I don't expect it to fix the problem. Just making things more explicit
in places of most frequent crashes.
|
2025-05-05 18:28:08 +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
|
cf2f48de06
|
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llui/llflatlistview.cpp
# indra/llui/llstyle.cpp
# indra/llui/llstyle.h
# indra/llui/lltextbase.cpp
# indra/llui/llurlmatch.cpp
# indra/llui/llurlmatch.h
# indra/llui/llurlregistry.cpp
# indra/llui/llurlregistry.h
# indra/newview/llavatarlist.cpp
# indra/newview/llavatarlist.h
# indra/newview/llavatarlistitem.cpp
# indra/newview/llavatarlistitem.h
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llviewerchat.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/colors.xml
|
2025-04-26 00:31:04 +02:00 |
|
Ansariel Hiller
|
ea96f7ac5e
|
More constexpr improvements and cleanup of includes of a deleted header file
|
2025-04-18 23:23:10 +03:00 |
|
Andrey Kleshchev
|
9a333e65c4
|
Merge develop into release/2025.04
|
2025-04-18 21:36:56 +03:00 |
|
Ansariel
|
86f0483152
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop
# Conflicts:
# indra/llmath/v2math.cpp
# indra/llmath/v2math.h
# indra/llmath/v3math.h
# indra/llmath/v4math.h
|
2025-04-18 20:24:19 +02:00 |
|
Ansariel
|
4c355879cc
|
Merge branch 'release/2025.05' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/llui/llfolderviewitem.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/newview/app_settings/settings.xml
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatermodelpreview.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfilter.cpp
# indra/newview/llinventoryfilter.h
# indra/newview/llmaterialeditor.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpaneloutfitedit.cpp
# indra/newview/llpaneloutfitsinventory.cpp
# indra/newview/llpaneloutfitsinventory.h
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelpermissions.h
# indra/newview/llpanelwearing.cpp
# indra/newview/llpanelwearing.h
# indra/newview/llselectmgr.h
# indra/newview/llskinningutil.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llviewerattachmenu.cpp
# indra/newview/llviewerinventory.cpp
# indra/newview/llviewerinventory.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llwearableitemslist.cpp
# indra/newview/skins/default/textures/textures.xml
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/floater_object_weights.xml
# indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
# indra/newview/skins/default/xui/en/menu_inventory.xml
# indra/newview/skins/default/xui/en/menu_outfit_tab.xml
# indra/newview/skins/default/xui/en/menu_wearing_tab.xml
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
# indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/en/panel_outfits_list.xml
# indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
# indra/newview/skins/default/xui/en/panel_places.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
# indra/newview/skins/default/xui/en/sidepanel_appearance.xml
# indra/newview/skins/default/xui/en/strings.xml
# indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml
# indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml
|
2025-04-16 17:49:47 +02:00 |
|
Andrey Lihatskiy
|
06a76eda6a
|
Merge branch 'develop' into marchcat/05-develop
|
2025-04-15 22:19:15 +03:00 |
|
Andrey Kleshchev
|
206f8d9e01
|
#3863 Ensure cloud texture selection updates the sky
|
2025-04-15 21:40:17 +03:00 |
|
Andrey Lihatskiy
|
ae93198735
|
Merge branch 'main' into marchcat/maint-c-restore
# Conflicts:
# indra/llcommon/lldate.h
# indra/newview/llappviewer.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llmaterialeditor.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llvoavatar.cpp
|
2025-04-15 19:31:20 +03:00 |
|
Ansariel
|
5197abfd1f
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
|
2025-04-15 17:54:29 +02:00 |
|
Jonathan "Geenz" Goodman
|
d19d44cc72
|
Merge pull request #3911 from secondlife/main
Merge 2025.03 release into develop.
|
2025-04-15 10:14:27 -04:00 |
|
Andrey Lihatskiy
|
5d7a5001b4
|
Merge commit '9e24b30' into marchcat/maint-c/restore
# Conflicts:
# indra/llmath/v2math.cpp
# indra/llmath/v2math.h
# indra/llmath/v3math.h
# indra/llmath/v4math.h
# indra/llui/llfolderviewitem.cpp
# indra/llui/llfolderviewitem.h
# indra/llui/llfolderviewmodel.h
# indra/llui/llmodaldialog.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llagent.cpp
# indra/newview/llagentcamera.h
# indra/newview/llavatarrenderinfoaccountant.cpp
# indra/newview/llconversationmodel.h
# indra/newview/llfloaterinventorysettings.cpp
# indra/newview/llfloaternamedesc.cpp
# indra/newview/llfloaternamedesc.h
# indra/newview/llfloaterobjectweights.cpp
# indra/newview/llfloaterobjectweights.h
# indra/newview/llfolderviewmodelinventory.h
# indra/newview/llinspecttexture.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorygallery.h
# indra/newview/llinventorygallerymenu.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmaterialeditor.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitgallery.h
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/llpanelgroupcreate.cpp
# indra/newview/llpanelgroupgeneral.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpaneloutfitsinventory.h
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelwearing.cpp
# indra/newview/llreflectionmap.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llteleporthistorystorage.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltexturefetch.cpp
# indra/newview/lltexturefetch.h
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewercamera.cpp
# indra/newview/llviewercamera.h
# indra/newview/llviewermenufile.cpp
# indra/newview/llviewerobject.h
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvovolume.h
# indra/newview/tests/llviewerassetstats_test.cpp
|
2025-04-10 06:01:50 +03:00 |
|
Ansariel
|
1537c9ed2c
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llmessage/message_prehash.cpp
# indra/newview/llimprocessing.cpp
# indra/newview/llimview.cpp
# indra/newview/llimview.h
# indra/newview/skins/default/xui/de/strings.xml
# indra/newview/skins/default/xui/en/strings.xml
# indra/newview/skins/default/xui/es/strings.xml
# indra/newview/skins/default/xui/fr/strings.xml
# indra/newview/skins/default/xui/it/strings.xml
# indra/newview/skins/default/xui/ja/strings.xml
# indra/newview/skins/default/xui/pl/strings.xml
# indra/newview/skins/default/xui/pt/strings.xml
|
2025-03-28 15:07:17 +01:00 |
|
Andrew Meadows
|
423df2ba4b
|
prevent erroneous edit of wrong parcel (#3759)
* prevent erroneous edit of wrong parcel
Fixes jira-archive-internal/issues/70771
[SL-20409] Erroneous Local Parcel Twins -
Parcel Updates Across Region Borders -
unrequested updateDatabaseParcel changes
* remove unused argument in sendParcelPropertiesUpdate()
|
2025-03-21 07:18:13 -07:00 |
|
Ansariel
|
6a10f6f20a
|
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llappdelegate-objc.mm
# indra/newview/llpanelface.cpp
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
|
2025-03-05 10:12:03 +01:00 |
|
Andrey Kleshchev
|
c98002daa6
|
#3643 Use bugsplat attributes on MacOS
|
2025-03-04 17:23:05 +02:00 |
|
Ansariel
|
fe41087069
|
Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
|
2025-02-19 15:20:09 +01:00 |
|
Maxim Nikolenko
|
8114850e94
|
#3511 fix for PBR skies being too bright on Low Graphics
|
2025-02-18 11:33:32 +02:00 |
|
Ansariel
|
8758495d11
|
Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llerror.cpp
# indra/llmath/v4math.h
# indra/llui/lltransutil.cpp
# indra/newview/llface.cpp
# indra/newview/llstartup.cpp
# indra/newview/llvovolume.cpp
|
2025-01-26 00:07:35 +01:00 |
|
Andrey Kleshchev
|
ad30637ebe
|
#3452 Crash in LLSaleInfo::asLLSD()
|
2025-01-22 18:59:38 +02:00 |
|
Ansariel
|
926c22e1b9
|
Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llrender/llfontfreetype.cpp
# indra/newview/llstartup.cpp
|
2025-01-07 13:56:32 +01:00 |
|
Andrey Kleshchev
|
a27515748f
|
#3311 RenderSkyAutoAdjustLegacy does not engage tonemapper
|
2025-01-02 20:55:17 +02:00 |
|
Ansariel
|
7c3b74a0df
|
Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llviewertexture.cpp
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
|
2024-12-04 16:11:44 +01:00 |
|
Jonathan "Geenz" Goodman
|
c02baded84
|
#3170 Fix for tonemapping not working with PBR skies.
|
2024-11-28 17:57:30 -05:00 |
|
Andrey Kleshchev
|
1b4814f0e5
|
viewer#3170 Fix tonemaping slider
At the moment slider is in general settings, not per environment
|
2024-11-29 00:12:27 +02:00 |
|
Ansariel
|
68d82c9793
|
Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llrender/llvertexbuffer.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lltexturefetch.cpp
# indra/newview/viewer_manifest.py
|
2024-11-27 19:23:33 +01:00 |