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
51142d1341
Merge branch 'main' into DRTVWR-567
...
# Conflicts:
# indra/newview/llappearancemgr.cpp
# indra/newview/llpanelmaininventory.cpp
2023-02-03 16:53:33 +02:00
ce5ac93883
SL-18629 - various notes on work for D567
2023-01-24 20:15:22 +00:00
f6208020f5
SL-18629 - use AISAPI for some paths of new category creation
2022-11-22 15:46:08 +00:00
27046fcc14
SL-18629 - moving createNewCategory to AIS3
2022-11-21 13:48:23 +00:00
9ee1a75474
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcommon/lluuid.cpp
# indra/llcommon/lluuid.h
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llscrolllistctrl.h
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersettingsdebug.h
# indra/newview/skins/default/xui/en/floater_settings_debug.xml
# indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
2022-11-01 17:17:56 +01:00
91f9f2e9f7
DRTVWR-570 Mac build fix: unused variables cleanup
2022-10-27 23:08:09 +03:00
401fa5a4e4
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-10-21 01:51:04 +02:00
3994101549
SL-18119 - more ViewerStats logs for NUX
2022-09-21 20:52:27 +01:00
56e1db9c15
SL-18119 - UIUsage logs for some common operations
2022-09-16 17:09:55 +01:00
b18f328c08
Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmachineid.cpp
2021-09-03 00:18:26 +03:00
9718a38e9a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-21 03:07:48 +02:00
2ded530f93
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llappcorehttp.cpp
# indra/newview/llappcorehttp.h
2021-07-19 22:20:45 +03:00
ec8bef8e9c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/cmake/bugsplat.cmake
# indra/newview/llappdelegate-objc.mm
2021-07-06 10:32:52 +02:00
8fcb479e4b
SL-15501 Viewer crash with unprotected use of std::vector::front()
2021-06-30 20:35:46 +02:00
b15f30a9ce
SL-15501 Viewer crash with unprotected use of std::vector::front()
2021-06-30 17:34:39 +03:00
826ee26272
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2021-06-08 19:55:43 +02:00
0382c73f9d
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-06-08 14:31:00 +02:00
823f97ac59
SL-15272 Bugsplat crashes at condition wait()
...
Made sure all waits will be triggered, won't loop back and that in case of http queue it had some time to trigger
2021-06-03 21:31:30 +03:00
96cbe52803
SL-15272 Bugsplat crashes at condition wait()
...
Made sure all waits will be triggered, won't loop back and that in case of http queue it had some time to trigger
2021-05-21 20:52:08 +03:00
9768f25de0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-05-02 02:08:40 +02:00
5eac975c19
Don't include LSL bridge in wearables ordering check
2021-04-14 21:33:11 +02:00
b5ecb33e3d
SL-15066 FIXED Wearing an existing, unsaved outfit does not restore correct wearables ordering
2021-04-14 21:33:10 +02:00
0cecb09a2f
SL-15066 FIXED Wearing an existing, unsaved outfit does not restore correct wearables ordering
2021-04-14 16:01:58 +03:00
b09601e60a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-02 20:19:15 +02:00
2933c66441
Fix outfit wearables ordering never getting updated when updating an existing outfit, which could lead to displaying incorrect outfit state
2021-03-20 16:17:13 +01:00
abc27703e6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-03 22:50:13 +01:00
185082f1bb
Merge branch 'master' into DRTVWR-521-maint
...
# Conflicts:
# indra/newview/llappviewer.cpp
2021-02-01 22:14:44 +02:00
15bbf6510c
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2020-12-09 13:14:39 +01:00
6397badddd
SL-14303 Wearable type label should contain translated intead of default string
...
Startup has two initStrings calls, only after second one LLtrans will return properly translated calls, but we don't want 'translated' for logging, so modified logging to not use getTypeLabel.
2020-11-13 14:58:14 +02:00
f7bd33161b
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2020-11-12 11:05:22 +01:00
af2abe17cd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 00:51:42 +01:00
92af5af736
Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
2020-11-11 23:34:37 +02:00
0303dd8179
Merge branch 'master' into DRTVWR-513-maint
...
# Conflicts:
# autobuild.xml
# indra/llui/llfolderviewmodel.h
# indra/newview/lltexturecache.cpp
# indra/newview/llviewermenu.h
# indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-11-11 22:14:24 +02:00
46ebe69f32
SL-14303 Fix LLWearableType to not spam in logs
2020-11-10 18:18:51 +02:00
95b4dd072e
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
2020-10-15 11:37:14 +02:00
1edd38e742
SL-14078 Maked couple functions as const
2020-10-12 18:35:34 +03:00
b8de97f0d9
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-29 08:46:56 +02:00
668df7c69c
FIRE-30096: Re-enable display of attachment mismatch state appearance list (it's expected behavior attachments will be displayed in red for a brief amount of time during attach/detach due to the two distinct sub-processes involved)
2020-09-27 21:56:13 +02:00
b5635da9e9
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-23 10:08:11 +02:00
825cfc2b6a
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterconversationpreview.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.h
# indra/newview/llvoicevivox.cpp
2020-09-22 23:30:12 +03:00
fe10f171d3
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llmessage/llcoproceduremanager.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
# indra/newview/skins/default/xui/en/strings.xml
2020-09-09 19:34:33 +02:00
a42045994d
SL-13555 'Second Life quit unexpectedly' error message
2020-08-28 01:30:37 +03:00
03955f96db
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-07-24 20:12:46 +02:00
cff453ff51
Merge remote-tracking branch 'eep/master' into fs-eep-vs2017
2020-05-20 13:49:20 +02:00
64f80748e7
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-18 21:50:17 +02:00
017627fa8b
SL-13174 FIXED Changed sequence of worn items could not be saved
2020-05-14 19:41:19 +03:00
2a6b48c9b0
DRTVWR-440, merge in latest from 6.3.7 release
2020-01-28 17:26:45 -07:00
7f9bce5ada
Merge branch 'master' into fs-vs2017
2019-12-21 01:52:19 +01:00
f61a5c4642
Merge viewer-release 6.3.6 into viewwer-eep repo
2019-12-16 12:47:19 -07:00
Ansariel