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
1cc41cb9c4
SL-19134 Remove llfloaterproperties
...
Looks like it wasn't used for a while and LLFloaterItemPropertie does the same thing now
2023-02-08 14:27:52 +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
db80fdb55b
SL-19104 update label and permissions display
2023-02-01 23:57:36 +02:00
ac3f1b54ec
SL-19104 Clean up inventory UI to prepare for thumbnails ( #66 )
2023-02-01 18:44:26 +02:00
999c8cd3b9
SL-19117 Textures should return asset id when thumbnail is not set
2023-02-01 16:38:47 +02:00
adae99b144
Merge branch 'DRTVWR-570-maint-Q' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llcallingcard.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llinventorybridge.cpp
2023-01-12 12:26:06 +01:00
b3201e75b1
SL-18945 Links have no 'cut' option
...
Links can be drag and dropped so they should be movable via 'cut' as well
2023-01-11 16:03:33 +02:00
007939f0a7
SL-18939 Cannot copy inventory folders with copiable links
2023-01-11 08:30:32 +02:00
1ca8584322
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-22 15:48:47 +02:00
88258b7fa1
SL-18353 Don't allow "Ungroup folder items" on outfit folders
2022-10-21 11:18:43 +02:00
0789d9bddf
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-21 01:41:17 +02:00
97b676b60f
Merge branch 'master' into DRTVWR-565-maint-P
2022-10-20 21:43:54 +03:00
4aaa686a2d
SL-18353 Don't allow "Ungroup folder items" on outfit folders
2022-10-20 02:16:02 +03:00
7c29d1fb34
Remove Show in Main View menu option from standalone folder inventory views, since there is no main view in these
2022-10-09 17:23:14 +02:00
aa25555e3f
Add Reload Folder action to inventory folders so users can try to refresh folders with missing content. Only works one folder at a time, and not on the root folder, to prevent misuse. Needs to be tested a lot.
2022-09-26 02:35:04 +02: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
7d0d744e34
Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/featuretable_linux.txt
# indra/newview/llagent.cpp
# indra/newview/llfloatertranslationsettings.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/notifications.xml
2022-09-13 19:37:45 +02:00
c118c27623
SL-18117 Smarter add and detach inventory menus
...
The 'exceptions' solution is a bit ugly, but alternative is remaking all inventory and chat menus to act based on registars
2022-09-10 00:57:39 +03:00
3d7c5c52d9
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-31 17:26:51 +02:00
55f51f4829
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-31 17:02:33 +02:00
2f42e999e0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/llhudtext.cpp
# indra/newview/llpanelpicks.cpp
# indra/newview/llpanelprofile.cpp
2022-08-31 16:04:49 +02:00
90c3e57768
Forgot to tag this
2022-08-23 14:39:17 +02:00
9dd035beda
Add option to open inventory folders in separate window
2022-08-23 14:35:21 +02: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
61119c137b
Merge branch 'DRTVWR-561-maint-O' of https://bitbucket.org/lindenlab/viewer
2022-07-16 14:25:37 +02:00
2785f1f33d
SL-17741 Fixed wrong condition
2022-07-15 20:23:12 +03:00
835d454a52
Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llviewerparcelmgr.cpp
2022-07-15 13:12:50 +02:00
e72c803df0
SL-17741 Paste is not disabled when copying 'no copy' items
...
We should allow to copy 'no copy' items for the ability to paste them as links, but regular 'paste' should be disabled in such case
Also fixed library items enabling 'paste as link', we can not link library items.
2022-07-09 17:10:13 +03:00
ed9dbabb5e
SL-17665 Add operation to create a subfolder from selected items in Inventory
2022-07-04 20:25:18 +03:00
9b0569840f
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
2022-05-31 01:58:09 +03:00
7d7aff4377
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
...
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llinventorymodel.h
2022-05-28 23:00:17 +02:00
7cc7b74778
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
2022-05-26 11:48:40 +02:00
91606c7b60
Merge branch 'master' into DRTVWR-548-maint-N
2022-05-26 03:07:05 +03:00
bc495fe39a
SL-17458 Cut works the same way as Copy when pasting into Favorites
2022-05-25 00:31:48 +03:00
ef88337eef
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-02 10:12:19 +01:00
a74de2d794
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 19:14:31 +01:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
1e0eafd50c
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/llviewerregion.cpp
2022-02-28 21:56:25 +02:00
b92d39af49
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-02-24 12:19:28 +01:00
8bd71fe6e8
SL-16904 FIXED The viewer crashes after trying to empty trash containing calling card
2022-02-23 18:38:06 +02:00
6638d1d367
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-26 12:31:20 +01:00
Ansariel