2bc4fb2bf0
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/llthreadsafequeue.h
# indra/llinventory/llsettingssky.cpp
# indra/llui/llfolderviewitem.cpp
# indra/llui/llview.h
# indra/newview/llaisapi.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterproperties.cpp
# indra/newview/llfloaterproperties.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llpanelmarketplaceinbox.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpathfindingnavmesh.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelinventory.cpp
# indra/newview/llsidepanelinventory.h
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
# indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
# indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
# indra/newview/skins/default/xui/en/sidepanel_inventory.xml
# indra/newview/skins/default/xui/en/sidepanel_item_info.xml
# indra/newview/skins/default/xui/en/sidepanel_task_info.xml
# indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
2023-02-13 23:35:21 +01:00
2f4902967a
Merge branch 'xcode-14.1' into andreyk/SL-19134
...
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
2023-02-03 22:59:50 +02:00
f156e0771f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-02-03 00:55:58 +01:00
50e8414428
Fix re-download from secondlife.com error messages.
2023-01-18 22:15:11 +00:00
4f4c9c7473
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-01-12 12:21:57 +01:00
bb718155bd
DRTVWR-575: Replace some LLSDArray() usage with llsd::array().
...
It seems newer compilers have a different interpretation of exactly when to
engage LLSDArray's copy constructor. In particular, this assignment:
some_LLSD_map[key] = LLSDArray(...)(...)...;
used to convert the LLSDArray object directly to LLSD; now it first calls the
custom copy constructor, which embeds the intended array within an outer array
before assigning it into the containing map.
The newer llsd::array() function avoids that problem because what it returns
is already an LLSD object.
Taking inventory of LLSDArray assignments of that form turned up a number of
workarounds like LLSD(LLSDArray(...)). Replacing those with llsd::array() is
both simpler and more readable.
Tip of the hat to Chorazinallen for surfacing this issue!
2023-01-03 18:06:45 -05:00
915d39bb8a
Revert "[FIRE-32453] [BUG-232971] disconnect sooner to force the cache write"
...
This reverts commit dbc4ab5147efb837b0f32a20375e7e2a5304dd1d.
2022-12-19 10:54:54 +00:00
49a0cdecc7
Revert "[FIRE-32453] fixup bug introduced by moving the camera shutdown"
...
This reverts commit 9d22f014479404346ce4fd9d700548ef68fe3f0d.
2022-12-19 10:53:47 +00:00
d668b30002
Revert "Rewrite the inventory corruption fix to reduce possible side-effects"
...
This reverts commit 5ddbef4a25
2022-12-19 10:53:18 +00:00
5ddbef4a25
Rewrite the inventory corruption fix to reduce possible side-effects
2022-12-17 16:31:16 +00:00
67081f9728
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloater360capture.cpp
2022-12-12 22:09:54 +01:00
0a39d27ba5
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-12-12 21:15:07 +01:00
f836194516
Merge branch 'main' into DRTVWR-570-maint-Q
...
# Conflicts:
# doc/contributions.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloater360capture.cpp
2022-12-12 20:53:11 +02:00
e2f7f57f47
[FIRE-32453] fixup bug introduced by moving the camera shutdown
...
Swept up the delete in the move of the disconnect code.
causes crash on exit.
2022-12-08 23:47:07 +00:00
d6165b732b
Merge branch 'DRTVWR-570-maint-Q' of https://github.com/secondlife/viewer
2022-12-02 15:41:59 +01:00
f1443cd88e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-12-02 13:02:42 +01:00
69a31fad4c
[FIRE-32453] [BUG-232971] disconnect sooner to force the cache write
...
The call to forceQuit sets the viewer state to Quitting. This triggers all the thread pools to exit, and to do so with no sense of orderly closure.
As a result the main window can exit which removes any visual indication to the user that work is still happening.
When the user then restarts, issues are caused because of temporary files that may still be in use.
It is possible too that the early closure of the mainwindow, allows the OS to terminate the process without prompting the user for a safe shutdown (unproven)
2022-11-27 23:02:59 +00:00
87664fa35d
SL-18219 Crash getting and sending render info on exit
...
There might be other causes for sendRenderInfoToRegion and getRenderInfoFromRegion, crashing, but in some cases viewer was shutting down
2022-11-22 23:08:47 +02:00
a6ce12ab2b
Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer
2022-11-11 13:27:28 +01:00
cb10f3b149
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# doc/contributions.txt
# indra/llcommon/threadsafeschedule.h
# indra/llwindow/llwindowmacosx-objc.mm
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/llappdelegate-objc.mm
# indra/newview/llfilepicker_mac.mm
# indra/newview/llsettingsvo.cpp
# indra/newview/llvosky.cpp
2022-11-11 12:15:54 +01:00
6a6b10020e
SL-18565 Built-in bump maps and some environment textures fail to load
...
Due to udp texture fetching no longer being present
2022-11-03 23:51:05 +02:00
d89033420e
Fix RenderAppleUseMultGL debug setting for enabling threaded GL engine
2022-10-29 23:18:03 -04:00
1ca8584322
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-22 15:48:47 +02:00
97b676b60f
Merge branch 'master' into DRTVWR-565-maint-P
2022-10-20 21:43:54 +03:00
2507bc6137
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-09-15 20:37:16 +02:00
656dd12dfc
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/llmodelpreview.h
2022-09-15 20:35:44 +02:00
329268c5f7
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# indra/newview/llmodelpreview.h
2022-09-15 20:44:04 +03:00
b5861e58cb
Merge branch 'master' into DRTVWR-565-maint-P
2022-09-15 20:43:02 +03:00
bf24665fa6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-04 16:36:35 +02:00
49b6f9b312
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-04 14:52:20 +02:00
6d09c9ff89
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-04 12:37:05 +02:00
59ab8e78f4
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llpanelobject.cpp
2022-08-04 00:17:55 +03:00
ea26ee5e92
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llvovolume.cpp
2022-08-04 00:15:36 +03:00
dfc1175546
Merge branch 'master' into DRTVWR-565-maint-P
2022-08-04 00:12:26 +03:00
33621382b4
Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llfloateroutfitsnapshot.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreference.h
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
2022-07-21 19:54:15 +02:00
fcb3b6917c
SL-17670 Simplify outfit snapshot floater
2022-07-19 18:56:59 +03:00
61119c137b
Merge branch 'DRTVWR-561-maint-O' of https://bitbucket.org/lindenlab/viewer
2022-07-16 14:25:37 +02:00
6fc22df480
SL-17727 FIXED Crash when specifying --graphicslevel option on mac
2022-07-08 19:03:51 +03:00
30df86e318
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
2022-06-29 22:07:42 +02:00
2c0edbac18
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
2022-06-29 22:04:20 +02:00
9300613edc
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-06-29 21:57:31 +02:00
fc11575657
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
2022-06-29 20:28:29 +02:00
2e837e5389
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llviewercontrol.cpp
2022-06-29 20:51:08 +03:00
77ce594dec
Merge branch 'master' into DRTVWR-544-maint
2022-06-29 20:31:17 +03:00
3a4a0bd3d2
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-06-29 17:25:32 +02:00
bd414ee0d0
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
2022-06-29 17:21:22 +02:00
db5806f004
SL-17329: Address Mac build error
2022-06-24 13:31:33 -07:00
5e8fd4f453
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/llappviewer.cpp
2022-06-24 22:22:51 +02:00
cfb6c083fe
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/llfilesystem/lldiskcache.cpp
# indra/llwindow/CMakeLists.txt
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
2022-06-24 22:18:44 +02:00
4f83471166
SL-17329: Fix cache sizes due to overflow. Improve typing.
2022-06-24 09:21:27 -07:00
Ansariel