6cb5a7425f
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/llskinningutil.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/skins/default/xui/ja/strings.xml
2025-05-23 12:22:21 +02:00
c085682b54
Primfeed integration V1
...
baseline Primfeed authentication/authorisation - working
chat interception login authentication - working
Primfeed Integration - WiP Authorisation connect/disconnect - working
Primfeed post photo support - working
Clean up ready for release
2025-05-19 23:24:32 +01:00
0d25562014
FIRE-34977 - Reduce Sim crossing overhead causing pauses
...
The purge thread should be the only thread recalculating cache usage. This removes the directory scan from the critial path where it would occasionally trigger due to aligned timers (exacerbated by high rates of region crossing)
2025-05-19 19:53:44 +01:00
ed69ead612
FIRE-35002 - revisit flickr preview not working
...
Previous fix only worked if at least one instance of floatersnapshot had previously been opened. flickr snapshot is now independent and can be opened directly from the tool icon
2025-05-14 10:58:38 +01:00
d362e4ed8f
Cleaned up comments (incorrect comment from JIRA title)
2025-04-22 16:54:35 -03:00
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
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
1f17536cc8
#3900 Skip checking AFK status during startup states
2025-04-13 01:43:36 +03:00
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
2813097aff
Merge commit '7947ce3' into marchcat/maint-c/maint-c-restore
...
# Conflicts:
# indra/newview/llappviewer.cpp
2025-04-10 01:05:12 +03:00
1243de5d84
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
2025-04-03 23:08:03 +02:00
e671cb54fe
#3795 Crash at getVolatileAPRPool()
2025-03-30 13:38:34 +03:00
99e1699479
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llappearance/llwearable.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llviewerassetstorage.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
2025-03-27 19:36:45 +01:00
d67859e483
Use LLCachedControl in llviewerwindow and llappviewer
...
Getting from gSavedSettings is expensive to do so often
2025-03-27 18:29:19 +02:00
b140406910
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-03-23 11:46:47 +01:00
4e2bfd7327
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llcallingcard.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/ja/strings.xml
# indra/newview/skins/default/xui/zh/strings.xml
2025-03-19 15:23:20 +01:00
62b2fcfd93
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-03-19 15:03:19 +01:00
c99e3167ed
#3644 Adjust throttle based of how busy buffer is
2025-03-18 21:25:09 +02:00
ddca8a3d62
Merge branch 'master' into FIRE-35081
2025-03-17 23:22:17 -03:00
c082f0cd76
FIRE-35081 - Handled animated/media textures, grass, tree and light textures
...
Added new boost levels for Tree, Grass and Light textures (More for tracking as they have custom hard coded values for the mPixelArea which causes issues with loading of sizes.
Added adjustments for the calcPixelArea and calcImportanceToCamera as well as getTextureVirtualSize
Added virtual texture size updates for Media textures
Added code to scale down off screen textures (saves a lot of texture VRAM.
Added additional features for the LLViewerTextureList::Dump
Only issue is server controlled textures which animate tend to load low quality, then upscale as well as Sculpted Volume's which force textures to reload.
2025-03-17 23:13:41 -03:00
3fd6a54fc5
Change CrashContext file name per new BugSplat update
2025-03-13 00:49:23 +00:00
750099db68
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llmessage/llproxy.cpp
# indra/llui/llfolderviewitem.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llviewerprecompiledheaders.h
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/floater_world_map.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
# indra/newview/viewer_manifest.py
2025-03-12 19:31:51 +01:00
4132a13972
Merge branch 'marchcat/maint-b-cherrypicks' into marchcat/2025.03-maint-b
2025-03-11 05:10:11 +02:00
95a395de22
#1080 BugSplat Crash: LLAppViewer::initStrings() - show crash reason
2025-03-11 04:22:22 +02:00
88f503ecc3
viewer-private#217 Cef log was deleted too often
...
delete once per session, not once per instance
# Conflicts:
# indra/newview/llviewermedia.cpp
2025-03-11 04:21:01 +02:00
d49359c086
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llaudio/llaudioengine_openal.cpp
# indra/llui/lltextbox.h
# indra/newview/llnotificationhandlerutil.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/skins/default/xui/de/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/pl/strings.xml
# indra/newview/skins/default/xui/pt/strings.xml
# indra/newview/skins/default/xui/ru/strings.xml
# indra/newview/skins/default/xui/tr/strings.xml
2025-03-08 13:15:21 +01:00
d4589f5972
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-foreverfps
2025-03-05 13:05:13 +01:00
5c2a331c44
#3644 Fix new logging of packet drops hitting performance #2
...
Misunderstood how mDroppedPackets worked, clear out what's not needed
2025-03-05 13:32:46 +02:00
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
3efe5b4934
#3644 Fix new logging of packet drops hitting performance
2025-03-04 21:15:15 +02:00
ed394cd5a0
#3591 rethrow should be mac specific
...
Jumped the gun a bit, since reportCrashToBugsplat is OS specific,
restore rethrow for other systems.
2025-03-04 17:23:05 +02:00
d19e6abc5e
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llstartup.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
# indra/newview/skins/default/xui/it/floater_avatar_textures.xml
# indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
# indra/newview/skins/default/xui/pl/floater_avatar_textures.xml
# indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
2025-03-01 01:09:19 +01:00
2f362aa126
Merge pull request #3583 'faster avatar loading' into release/2025.03
2025-02-27 20:51:04 +02:00
b52842ee2a
theoretical earlier start to asset downloads during startup ( #3589 )
...
* process UDP packets earlier in startup sequence
* call lazyAttach() when nonzero pending attachments
2025-02-27 19:50:17 +02:00
55a39da74e
FIRE-35081 Blurry prims not changing with graphics settings, not happening with SL Viewer - cont.
...
Refined the logic for the textures to include animated textures to not be downscaled They are not forced to be high boost level.
Update the logic of how to process the on screen max vsize to be simpler.
Added split time max_time for the updateImagesCreateTextures, as originally they were two different functions and can save doubled the time for each.
Added time limit on LLViewerObjectList::updateApparentAngles, as it it affects the Textures in the texture list and worked on a fixed # of objects per frame and each object is variable in the amount of processing required, affecting frame rate and # of textures updated.
2025-02-27 08:55:47 -04:00
39610cbfb3
#3591 Remove now pointless rethrow
2025-02-26 21:50:46 +02:00
bbcfa66f23
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llappviewer.h
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llviewermenu.cpp
2025-02-26 10:15:24 +01:00
056dc00ebe
#3591 More test coverage for crashes
2025-02-25 22:10:08 +02:00
847fd636cd
Merge branch release/2025.03
...
# Conflicts:
# indra/newview/llmeshrepository.cpp
# indra/newview/llmeshrepository.h
2025-02-19 17:29:48 +02:00
0bbbf5570a
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llchiclet.cpp
2025-02-19 15:36:44 +01:00
8c1f00eebc
Merge Forever Fps into 2025.03
...
Merge Forever Fps into 2025.03
2025-02-19 14:06:26 +02:00
6d0b0a77ee
drain UDP socket to avoid dropped packets ( #3565 )
...
drain UDP socket in idleNetwork() to avoid dropped packets
2025-02-18 11:38:52 -08:00
60121683ea
#3520 Name name cache based on grid
2025-02-18 18:40:39 +02:00
7ca41f92d2
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-02-07 19:25:29 +01:00
1562c140b5
Don't create instance if using legacy notification floater
2025-02-06 18:27:19 +01:00
b39fd18744
FIRE-35130 - crash on login with "use legacy notification floater" on
2025-02-06 01:53:56 +00:00
b84f3ff6b1
viewer#2780 Speed up terrain loading on teleport
...
Terrain was arriving and processing too late resulting in issues like
"Lower terrain material incorrectly shown momentarily"
2025-02-05 18:50:31 +02:00
5fedf54b4d
More FIRE-35118 - Deferred deletion of notifications. Code and tag cleanup,
...
work for all types of notifications
2025-02-05 04:07:54 +00:00
dac7725c40
Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/skins/default/xui/en/panel_preferences_setup.xml
# indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
2025-02-03 16:11:21 +01:00
58d159ed4f
FIRE-35118 - lag event for Clicking "Delete All" for a lot of group notices
2025-02-03 03:20:22 +00:00
Ansariel