livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
68,590 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

499 Commits (b157ab47c00f9f5bc3bd2533f32cd12a4a7c2efd)

Author SHA1 Message Date
Ansariel b157ab47c0 Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/newview/llagentui.cpp
#	indra/newview/llcallingcard.cpp
#	indra/newview/llfloateravatarrendersettings.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llimview.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/skins/default/xui/de/floater_tools.xml
#	indra/newview/skins/default/xui/en/floater_display_name.xml
#	indra/newview/skins/default/xui/en/floater_tools.xml
#	indra/newview/skins/default/xui/es/floater_tools.xml
#	indra/newview/skins/default/xui/ru/floater_tools.xml
 2023-01-12 16:56:08 +01:00
Andrey Lihatskiy f9866a3543 Merge branch 'main' into DRTVWR-573-maint-R 
# Conflicts:
#	autobuild.xml
#	indra/newview/llagent.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llimview.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llpanelmediasettingsgeneral.cpp
#	indra/newview/pipeline.cpp
 2023-01-12 04:37:42 +02:00
Maxim Nikolenko 94cc914947
SL-18823 FIXED Crash when using 'Create folder from selected' 2022-12-09 14:47:26 +02:00
Mnikolenko Productengine 9f7c22bbe5 SL-18810 FIXED "Find Original" doesn't work if Item profile was previously selected 2022-12-09 11:12:20 +02:00
Maxim Nikolenko 333786d2ba SL-18644 reset 'All items' filter when using 'Find Original' in Recent tab 2022-11-17 17:21:37 +02:00
Mnikolenko Productengine 27f7edeedb SL-16534 The link item is not updating after rezzing the linked object in-world 2022-10-28 19:55:40 +03:00
Ansariel e4816961a4 Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer 2022-10-22 16:53:15 +02:00
Andrey Kleshchev b2ad2f0645 SL-18297 A freeze while checking marketplace for errors 2022-10-06 22:42:49 +03:00
Ansariel 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
Andrey Kleshchev 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
Ansariel 714f669c06 FIRE-31816: Include selection count when deleting more than one object from inventory 2022-08-15 14:41:11 +02:00
Ansariel 61119c137b Merge branch 'DRTVWR-561-maint-O' of https://bitbucket.org/lindenlab/viewer 2022-07-16 14:25:37 +02:00
Mnikolenko Productengine caa5b92fb7 SL-17665 additional checks to avoid moving protected folders 2022-07-11 16:46:19 +03:00
Mnikolenko Productengine ed9dbabb5e SL-17665 Add operation to create a subfolder from selected items in Inventory 2022-07-04 20:25:18 +03:00
Ansariel 496156073b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-12-16 18:56:31 +01:00
Ansariel 36e0b1a4e1 RLVa fix: Prevent "Show Original" from circumventing @showinv restriction 2021-11-29 09:56:58 +01:00
Ansariel 969762f162 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 16:29:50 +01:00
Andrey Lihatskiy 30c381406c Merge branch 'master' into DRTVWR-530-maint 
# Conflicts:
#	doc/contributions.txt
 2021-11-16 01:09:11 +02:00
Ansariel 1536fdd1c3 Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer 2021-08-24 10:47:18 +02:00
Ansariel 7ff7317779 Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer 2021-08-02 09:35:11 +02:00
Ansariel 9718a38e9a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-07-21 03:07:48 +02:00
Mnikolenko Productengine 66793abc71 SL-14075 allow exporting multiple textures with the same name 2021-07-02 16:11:39 +03:00
Ansariel afd82248e5 FIRE-31037: "Recent" inventory filter gets reset when using "Show Original" 2021-07-01 11:16:00 +02:00
Ansariel e893536a3a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-06-25 16:02:59 +02:00
Andrey Lihatskiy 8b5fe507a4 Merge branch 'master' into DRTVWR-530-maint 2021-06-25 01:02:15 +03:00
Andrey Lihatskiy 293272c2c7 Merge branch 'master' into DRTVWR-521-maint 2021-06-25 00:52:03 +03:00
Mnikolenko Productengine cb8b5f6ba6 SL-15223 FIXED "Reason: 'Not Found'" error message floater is shown when delete the unlisted listing folder 2021-05-17 17:14:52 +03:00
Ansariel f206994f46 Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer 2021-03-31 14:40:20 +02:00
Mnikolenko Productengine 89b4611fc0 SL-15036 Add actions to move landmarks between tabs in the Places floater 2021-03-30 15:53:22 +03:00
Ansariel 47d9576f04 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-15 19:16:15 +01:00
Ansariel 21b6bf8331 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-15 18:26:27 +01:00
Kitty Barnett c8286c2403 Merge branch 'rlva/development' 2021-02-13 13:56:46 +01:00
Ansariel abc27703e6 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-03 22:50:13 +01:00
Ansariel 160d874a9c Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llui/llchat.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/llviewerinventory.cpp
 2021-02-03 22:09:42 +01:00
Ansariel bdfa92fb91 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-03 19:50:18 +01:00
Andrey Lihatskiy 185082f1bb Merge branch 'master' into DRTVWR-521-maint 
# Conflicts:
#	indra/newview/llappviewer.cpp
 2021-02-01 22:14:44 +02:00
Andrey Lihatskiy 2cf9c01175 Merge branch 'master' into DRTVWR-518-ui 2021-02-01 22:11:35 +02:00
Kitty Barnett db3ec78900 Fixed minor UI disabling issue related to Touch/Edit of attachments + @showloc and @edit (=open) workarounds 2021-01-07 23:24:48 +01:00
Kitty Barnett 712030c8fc Merge branch 'viewer/build' into rlva/development 2021-01-07 17:18:10 +01:00
Mnikolenko Productengine 6ec194154b SL-13826 Show result of "Find original" and "Show original" in Main Inventory floater and reset the filters to guarantee success 2020-12-10 17:43:21 +02:00
Ansariel 4229dee81b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-12-09 12:26:51 +01:00
Ansariel 9c59e52b4f Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-12-09 11:44:48 +01:00
Ansariel 09acce7337 FIRE-30518: Multi-preview not working for contents of rezzed objects 2020-11-24 17:49:42 +01:00
Andrey Lihatskiy ac3db22abc Merge branch 'master' into DRTVWR-518-ui 2020-11-13 18:27:29 +02:00
Ansariel c7fa67a466 Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer (and undo "Find/Show Original" opening a new inventory window) 2020-11-12 20:04:54 +01:00
Ansariel 63595964b6 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-11-12 09:45:26 +01:00
Ansariel af2abe17cd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-11-12 00:51:42 +01:00
Andrey Kleshchev 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
Andrey Lihatskiy 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
Mnikolenko Productengine b484a27365 SL-13826 Open a new inventory floater for "Find original" and "Show original" result 2020-11-04 18:53:56 +02:00