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
627c7de801
SL-19134 Some texture related adjustments
2023-02-07 12:36:20 +02: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
2d6edb088e
SL-19149 Highlight string match is misplaced when searching worn items
2023-02-03 22:22:11 +02: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
f156e0771f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-02-03 00:55:58 +01:00
db80fdb55b
SL-19104 update label and permissions display
2023-02-01 23:57:36 +02:00
6ada89ce0b
SL-19117 Extend texture preview to show thumbnails when present
2023-02-01 16:38:47 +02:00
1140ae3489
Add a texture inspector and show it when hovering over an inventory textory (or folder containing - among others - exactly one texture) and when hovering over notecard embedded textures
2023-02-01 16:38:47 +02:00
50e8414428
Fix re-download from secondlife.com error messages.
2023-01-18 22:15:11 +00:00
f3cd329b58
SL-18911 My Land Holdings floater crashes viewer on the Xcode/+Monterey branches ( #47 )
...
Revert part of "DRTVWR-575: Address review comments on Xcode 14.1 type tweaks."
Crash was reproduced when assigning areastr to llsd, but likely present in other cases of assigning ui strings to llsd (instead of going for lluistring's result directly copy constructor was engaged and either copy or original crashed due to invalid pointers, copy shouldn't have been created).
2023-01-10 19:38:44 +02: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
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
a7d55b4e77
Merge branch 'DRTVWR-570-maint-Q' of https://github.com/secondlife/viewer
2022-11-22 16:30:35 +01:00
e231b6d8d3
SL-18689 Crash at LLTabContainer::selectNextTab()
...
FPE_NOOP at "idx = (idx + 1 ) % (S32)mTabList.size();"
2022-11-22 01:45:04 +02:00
7732257ea5
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
2022-11-02 13:05:00 +01:00
31115dac2c
Merge remote-tracking branch 'RyeMutt/viewer/minor-fixes' into DRTVWR-570-maint-Q
2022-11-01 23:12:58 +02:00
39e08b34b1
Merge remote-tracking branch 'RyeMutt/viewer/llsd-usage-fixes' into DRTVWR-570-maint-Q
2022-11-01 23:11:57 +02: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
8669f3f4c2
Fix line editors deselecting when pressing capslock
2022-10-30 06:59:54 -04:00
d0e07c770b
Fix checks for empty LLSD maps to use size and not emptyMap which is for creating an empty LLSDMap type.
2022-10-30 06:56:16 -04:00
8de9beeb6f
SL-18388 Searchable debug settings UI
2022-10-24 21:46:14 +03:00
1ca8584322
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-22 15:48:47 +02:00
8b0d341aca
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-21 12:34:53 +02:00
0789d9bddf
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-21 01:41:17 +02:00
e0ace0c722
Merge branch 'master' into DRTVWR-570-maint-Q
...
# Conflicts:
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
2022-10-20 22:34:11 +03:00
97b676b60f
Merge branch 'master' into DRTVWR-565-maint-P
2022-10-20 21:43:54 +03:00
47964fb28d
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
2022-10-20 16:47:38 +02:00
a9c29b4b81
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llui/lllineeditor.cpp
# indra/llui/llmenugl.cpp
# indra/llui/llmenugl.h
# indra/llui/lltexteditor.cpp
# indra/newview/llfloaterbump.cpp
# indra/newview/llfloaterbump.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llnetmap.cpp
2022-10-20 10:51:25 +02:00
589a167147
Fix leak of LLFolderViewModel sorter and filter with unique_ptr
2022-10-19 22:19:22 -04:00
2745465c73
Fix leak of item pairs during LLFlatListView destruction
2022-10-19 22:15:17 -04:00
bbd8df15de
Fix menu leaks and lazy creation in text editing and scroll lists
2022-10-19 16:28:03 -04:00
b9552e596f
Reduce folderview menu bloat via lazy creation on right click
2022-10-19 16:21:05 -04:00
1fb1a9df7a
Fix leak of context menu branches
...
Introduce menu bloat logging code
2022-10-19 16:21:01 -04:00
9fb09ce231
FIRE-32175 - Linux/SDL2: Alt-Tab pushes a tab character into scripts and notecards
2022-10-04 20:47:39 +02:00
fe60229dfc
Merge branch master (DRTVWR-571) into DRTVWR-548-maint-N
2022-09-16 00:12:02 +03:00
7957946f90
Merge branch 'master' into DRTVWR-565-maint-P
2022-09-15 23:08:53 +03:00
afab093022
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-09-15 21:19:32 +02:00
f4b0915ca8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llui/llmodaldialog.cpp
2022-09-15 21:19:16 +02:00
cf85e854e5
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-09-15 21:14:13 +02:00
2507bc6137
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-09-15 20:37:16 +02:00
f30c396a6e
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
2022-09-15 20:36: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
1f3b96dd9c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-09-15 19:56:19 +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
dd5aa8f6f4
SL-18153 Fixed bring to front multiple dialog handling
2022-09-15 01:56:54 +03:00
d82d94f41c
SL-18153 Fix invisible blocking popup
...
Don't add popup to the list twice
2022-09-14 22:50:44 +03:00
c50dd63ca3
SL-18153 Fix invisible blocking popup
...
Don't add popup to the list twice
2022-09-14 21:08:35 +03:00
22b72a328b
Slight optimization
2022-09-14 14:20:40 +02:00
Ansariel