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

1340 Commits (331c6de052482ae8a8d90d2491341dc1d427b048)

Author SHA1 Message Date
Kitty Barnett 331c6de052 Merge branch 'rlva/development' 2021-07-11 23:28:15 +02:00
Kitty Barnett a6946626d0 Add @share restriction to block giving inventory 2021-06-20 15:04:11 +02:00
Ansariel c2addaf78e Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer 2021-04-22 08:15:41 +02:00
Mnikolenko Productengine 2c88c74276 Revert "SL-12475 add Inventory Favorites tab" 2021-04-21 12:12:04 +03:00
Mnikolenko Productengine b1fad32e8b Revert "SL-14633 FIXED The item from the favorite tab in the inventory floater can be purged" 2021-04-21 12:08:24 +03:00
Kitty Barnett 39d77476df Merge branch 'viewer/build' into rlva/development 2021-04-05 14:55:26 +02:00
Ansariel d36f1c75ad Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer 2021-03-03 15:08:10 +01:00
Andrey Kleshchev 14826e17dc SL-14654 [EEP] Aplying settings locally now is instant 
The 1 second fade makes it harder to compare different settings.
 2021-02-25 23:48:48 +02:00
Mnikolenko Productengine 5bdc96784c SL-12475 Add the way to reset current Favorites folders 2021-02-23 18:41:15 +02:00
Ansariel 91346628f6 Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer 2021-02-19 09:02:07 +01:00
Andrey Kleshchev 18717562ee SL-14654 [EEP] Aplying settings locally now takes 1 second insterad of 5 2021-02-19 00:05:52 +02:00
Ansariel a5bce51208 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-09 21:09:58 +01:00
Beq 1d6105b671 FIRE-30701 - Transition time for EEP 'apply to myself' from inventory 2021-02-08 19:37:13 +00:00
Beq 49039e66ea Avoid AvNameCache log spam for NULL UUID 2021-02-07 17:20:15 +00: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 2cf9c01175 Merge branch 'master' into DRTVWR-518-ui 2021-02-01 22:11:35 +02:00
Ansariel 52b3bb404c Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-01-17 12:38:03 +01:00
Kitty Barnett 712030c8fc Merge branch 'viewer/build' into rlva/development 2021-01-07 17:18:10 +01:00
Ansariel 234ed3bed3 Appease people using the outfit system in an unintended way by creating subfolders - and before LL adds their incomplete solution. This will of course not update the outfit list in the appearance window properly at all, but that's not my problem 2021-01-06 19:38:45 +01:00
Mnikolenko Productengine 1087c26de7 SL-14633 FIXED The item from the favorite tab in the inventory floater can be purged 2021-01-06 12:08:21 +02: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 f138e69ea1 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-11-24 10:47:48 +01:00
Ansariel 40b0af5b1c Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-11-20 23:02:29 +01:00
Ansariel ad78534abc Add some explanatory comment 2020-11-19 13:57:13 +01:00
Ansariel bd14ef42b3 FIRE-30495: Revert commit 3df26d1e24 because it's 2020 and internationalization is still a thing... 2020-11-17 01:22:46 +01:00
Ansariel 3df26d1e24 After discussion with Nicky: Use user's locale from OS if using system default language, otherwise use locale configured in particular language_settings.xml file 2020-11-15 10:58:06 +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 7735905d18 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-11-12 17:56:43 +01:00
Ansariel af2abe17cd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-11-12 00:51:42 +01: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
Ansariel 95b4dd072e Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer 2020-10-15 11:37:14 +02:00
Andrey Kleshchev 131996176f SL-14078 Small optimization 2020-10-12 22:53:36 +03:00
Andrey Kleshchev 1edd38e742 SL-14078 Maked couple functions as const 2020-10-12 18:35:34 +03:00
Kitty Barnett edc6e1dd8b Merge branch 'viewer/build' into rlva/development 2020-10-11 22:11:49 +02:00
Andrey Lihatskiy 32cb17e3bb Merge branch 'master' into DRTVWR-513-maint 
# Conflicts:
#	indra/newview/llgroupmgr.cpp
 2020-09-28 22:24:12 +03:00
Ansariel b677e01629 Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer 2020-09-23 19:02:19 +02:00
Ansariel b5635da9e9 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-09-23 10:08:11 +02:00
Andrey Lihatskiy 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
Ansariel d0fb2a173d Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-09-20 19:50:03 +02:00
Kitty Barnett cddc7cb040 Merge branch 'rlva/development' 2020-09-19 13:31:34 +02:00
Kitty Barnett aebcd1855d Change RLVa string constants over to opt-in constexpr string_views (but keep char* by default) 2020-09-16 01:35:44 +02:00
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
maxim_productengine 42e1a9ed87 SL-12475 add Inventory Favorites tab 
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorypanel.cpp
 2020-09-09 00:44:24 +03:00
Mnikolenko Productengine b95d780b2e SL-13457 FIXED Crash in LLFolderViewGroupedItemBridge::canWearSelected 2020-06-15 16:07:05 +03:00
Kitty Barnett b0e3bb9184 Merge branch 'viewer/build' into rlva/development 2020-06-11 17:48:32 +02:00
Ansariel e7c9024d75 Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer 2020-06-03 12:28:08 +02:00