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

1279 Commits (fe10f171d33dc22bf1ec4aad20e480bc6a9f8b1a)

Author SHA1 Message Date
Ansariel 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
Andrey Lihatskiy d50131c0ac Revert "SL-12475 add Inventory Favorites tab" 
This reverts commit 92499ce1b4.

# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llinventorypanel.h
 2020-09-09 01:22:18 +03:00
Ansariel 6a05670f6f Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501 2020-06-03 09:26:07 +02:00
Ansariel aa99fc52db Don't allow creating settings on the "worn" inventory tab 2020-05-28 17:09:45 +02:00
Ansariel 72a50ca425 FIRE-29605: Add correct "New Outfit" menu option for the "Outfits" inventory folder and disable disallowed menu items 2020-05-28 17:05:45 +02:00
Ansariel 6afd505fa8 Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer 2020-05-05 15:24:10 +02:00
Andrey Lihatskiy ec9b989863 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint 
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
 2020-05-05 00:37:16 +03:00
Ansariel 86ed969a9f Fix "LLAppearanceMgr::canAddWearables : Unexpected wearable type" warning everytime right-clicking any non-wearable item in inventory 2020-04-29 23:30:27 +02:00
Ansariel dbf00cf036 Merge branch 'master' 2020-04-23 17:40:31 +02:00
Andrey Lihatskiy c757c29c95 Merge branch 'master' into DRTVWR-500 
# Conflicts:
#	indra/newview/pipeline.cpp
 2020-04-20 21:23:34 +03:00
Ansariel 22ac7edd6e FIRE-20414 / FIRE-29342: Add option to protect folders from getting moved or deleted 2020-04-14 17:03:26 +02:00
Ansariel cfadf33220 FIRE-28977: Protect special and protected folders from being DaD'ed 2020-04-11 21:56:27 +02:00
Dave Houlton 7674c00fb9 Merge master (v 6.3.8) into DRTVWR-440 2020-02-21 12:05:46 -07:00
maxim_productengine 92499ce1b4 SL-12475 add Inventory Favorites tab 2020-01-27 17:54:02 +02:00
Ansariel dc2a972024 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-01-08 17:45:46 +01:00
Dave Houlton f61a5c4642 Merge viewer-release 6.3.6 into viewwer-eep repo 2019-12-16 12:47:19 -07:00
Ansariel f7783ca561 Fix unable to copy&paste into outfits anymore 2019-12-16 14:05:55 +01:00
Ansariel da365b227e Merge Firestorm LGPL 2019-12-13 18:15:19 +01:00
Ansariel 6e340961c0 Merge viewer-neko 2019-10-30 18:05:01 +01:00
Ansariel 46f739f348 Merge viewer-lynx 2019-10-29 18:32:17 +01:00
andreykproductengine 43809e1c5c SL-12180 Crash on requestOfflineMessagesCoro 2019-10-23 22:37:59 +03:00
Ansariel 0cb17cd365 Merge Firestorm LGPL 2019-10-16 23:31:52 +02:00
Brad Payne (Vir Linden) c7747d2a1b merge 2019-10-16 22:24:03 +01:00
Ansariel 37312f6fb3 Merge viewer-eep 2019-09-11 01:41:37 +02:00
Ansariel 9f005065d0 Merge Firestorm LGPL 2019-09-10 23:40:54 +02:00
Graham Linden 3609eabe54 Merge viewer-release 6.3.2 2019-09-10 12:07:01 -07:00
Ansariel e33586015d Merge Firestorm LGPL 2019-09-06 17:53:56 +02:00
Ansariel eb7c4ab0a6 Merge Firestorm LGPL 2019-09-06 17:48:12 +02:00
Ansariel 9a8dcbf613 Merge Firestorm LGPL 2019-09-06 17:46:08 +02:00
AndreyL ProductEngine 3631057bfa Line endings fix 2019-10-17 21:58:18 +03:00
Mnikolenko Productengine aab8ea7236 SL-12121 FIXED Unable to delete folders from 'Marketplace listings' 2019-10-17 19:15:02 +03:00
Ansariel 932dc479f2 FIRE-24334: Remove restriction on adding system layers with identical asset UUIDs at the same time since at some point LL fixed it server-side and creating a new asset UUID 2019-09-02 20:43:57 +02:00
Ansariel 1e5830f55f Merge viewer-eep 2019-08-26 21:51:36 +02:00
Rider Linden 1f656735d3 SL-11705, SL-11706: New flags in llsettings base for tracking by simulator. 2019-08-26 11:43:45 -07:00
Ansariel 4087c4c077 Merge Firestorm LGPL 2019-08-13 20:17:51 +02:00
Ansariel 529569cdd9 Merge viewer-neko 2019-08-04 12:09:33 +02:00
andreykproductengine 0277bc7af7 SL-11645 Replacing outfit from an object leaves one item unworn 2019-07-24 16:56:17 +03:00
Ansariel d82f98180c Merge Firestorm LGPL 2019-07-12 20:13:35 +02:00
Ansariel 25d83975f4 Merge Firestorm LGPL 2019-06-22 20:54:01 +02:00
ziree e8dd027586 Added Texture Refresh function to inventory context menu for worn attachments. 2019-06-21 17:52:00 +02:00
Ansariel e2620e973f Merge viewer-neko 2019-06-20 09:50:07 +02:00
Ansariel 89a6a001fc Merge viewer-neko 2019-06-17 21:48:11 +02:00
andreykproductengine 1f1b51c7ce SL-11361 Moving folder to My Outfits should create an outfit 2019-06-14 20:27:39 +03:00
maxim_productengine 618446f8df SL-11324 FIXED Accidental deletion of Marketplace Listings folder possible 2019-05-31 18:10:50 +03:00
Ansariel e6970af7a1 Merge Firestorm LGPL 2019-05-09 19:52:27 +02:00
Graham Linden 605c9c1966 Fix merge fail. 2019-05-08 11:42:31 -07:00
Graham Linden 470d1595cc Merge viewer-release 2019-05-08 09:30:39 -07:00
Ansariel 53ce33aaa9 Merge Firestorm LGPL Bear 2019-05-03 23:11:40 +02:00
Ansariel 8b75f941c0 Merge viewer-bear 2019-05-03 23:06:01 +02:00
AndreyL ProductEngine 5e5c5ca09c Merged SL-10400 and SL-10401 2019-04-26 21:02:00 +03:00