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

334 Commits (1a437cbedf94de90d749f426dde09f2466693de2)

Author SHA1 Message Date
Andrey Kleshchev 189723fd46 SL-18161 Properly list pbr material folder 2022-09-15 21:38:38 +03:00
Andrey Kleshchev 5d918f98ea SL-18161 Add PBR materials to Uploads in preferences 2022-09-15 00:29:54 +03:00
Andrey Kleshchev 0ab6dfa12e SL-17699 Multiple asset types support for LLAssetFilteredInventoryPanel 2022-08-17 22:03:14 +03:00
Andrey Kleshchev 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
Dave Houlton 353329c2c2 DRTVWR-546 merge in master v6.5.1 2021-11-16 11:44:55 -07:00
Andrey Lihatskiy f9373a9b4e Merge branch 'master' into DRTVWR-527-maint 
# Conflicts:
#	autobuild.xml
#	indra/newview/installers/windows/lang_pl.nsi
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llinventorymodel.cpp
 2021-11-16 00:54:53 +02:00
Dave Parks 8d20480c5f SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton 2021-10-28 18:06:21 +00:00
Andrey Lihatskiy 0ca16a1f95 Merge branch 'master' into DRTVWR-527-maint 
# Conflicts:
#	indra/newview/llinventorypanel.cpp
 2021-06-25 01:02:04 +03:00
Andrey Lihatskiy 7f19c512c9 Merge branch 'master' into DRTVWR-522-maint 
# Conflicts:
#	indra/newview/app_settings/settings.xml
 2021-06-25 00:54:35 +03:00
Mnikolenko Productengine 2c88c74276 Revert "SL-12475 add Inventory Favorites tab" 2021-04-21 12:12:04 +03:00
Andrey Kleshchev 5e134b4732 SL-13182 Fix root folder's state 2021-04-09 17:19:43 +03:00
Andrey Kleshchev 378855253a SL-13182 Fix root folder's state 2021-04-07 20:57:02 +03:00
Andrey Kleshchev 7d31436009 SL-13182 Expanded buildNewViews with build modes 2021-04-02 21:40:09 +03:00
Andrey Kleshchev 7ddbf118f5 SL-13182 Split buildNewViews over frames 2021-04-01 23:06:44 +03:00
Mnikolenko Productengine 5bdc96784c SL-12475 Add the way to reset current Favorites folders 2021-02-23 18:41:15 +02:00
Andrey Lihatskiy f047e2236c Merge branch 'master' into DRTVWR-522-maint 2021-02-01 22:14:56 +02:00
Andrey Lihatskiy 2cf9c01175 Merge branch 'master' into DRTVWR-518-ui 2021-02-01 22:11:35 +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
Mnikolenko Productengine 1884da366d SL-1777 FIXED Uploading Image or Saving Snapshot while in Inventory Recent tab jumps to Main tab 2020-12-07 17:37:20 +02:00
Andrey Kleshchev 3efc4f5a4f SL-14370 Don't init inventory views if they aren't needed 
These views are 'heavy' and rarely used, don't init them all the time.
 2020-11-23 20:55:00 +02:00
Andrey Lihatskiy ac3db22abc Merge branch 'master' into DRTVWR-518-ui 2020-11-13 18:27:29 +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
Mnikolenko Productengine 5bfa73a12e SL-14161 FIXED an item persists in inventory after dragging it to the marketplace listings 2020-10-22 18:05:33 +03:00
Andrey Lihatskiy 4e43097c77 Merge branch 'master' into DRTVWR-518-ui 
# Conflicts:
#	indra/newview/llfloaterbuycurrency.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/skins/default/xui/en/floater_buy_currency.xml
 2020-09-28 22:33:51 +03: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 e1504d8c56 SL-13178 Improve initial opening time of the landmarks floater 2020-05-05 21:09:42 +03:00
Mnikolenko Productengine 9c3368bbf6 SL-13178 Improve initial opening time of the landmarks floater 2020-05-05 19:08:55 +03: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
Andrey Kleshchev 694c6e1d84 SL-13119 Optimize initialization of inventory views 2020-04-28 18:13:14 +03:00
Dave Houlton 2a6b48c9b0 DRTVWR-440, merge in latest from 6.3.7 release 2020-01-28 17:26:45 -07:00
maxim_productengine 92499ce1b4 SL-12475 add Inventory Favorites tab 2020-01-27 17:54:02 +02:00
andreykproductengine f7ad4bdd19 SL-209 Cleanup Merchant Outbox 2019-08-15 19:53:34 +03: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
andreykproductengine d903f8c1a1 SL-10470 Fixed freeze due to extensive logging 2019-02-05 16:14:27 +02:00
andreykproductengine c8d8414b3b SL-10509 EEP Settings Picker gets closed by drag&drop 2019-02-08 19:06:20 +02:00
maxim_productengine 91952ec0a5 SL-10275 FIXED [EEP] Pressing Enter while setting "Settings From Inventory" opens the Day Cycle 2018-12-21 17:45:06 +02:00
Rider Linden 56d9d204f7 Merge 2018-12-13 15:52:44 -08:00
maxim_productengine ccd20624e3 SL-10018 FIXED Viewer crashes when clicking on a link of a folder in Inventory 2018-11-09 16:44:06 +02:00
andreykproductengine 629d21e4ec SL-1386 Fix for onSelectionChange crash 2018-11-05 17:52:53 +02:00
andreykproductengine 4d94cbd392 SL-9733 Implemented drag and drop support for presorted panel 2018-10-12 18:12:51 +03:00
andreykproductengine a209d207d3 SL-9733 Fixed missed removal updates and reenabled trash folder 2018-10-12 17:49:21 +03:00
andreykproductengine fdde250d58 SL-9733 Added prefiltered inventory panel to prevent creation of unneeded views 2018-10-10 16:10:16 +03:00
andreykproductengine 83b508a656 Backed out SL-9733 - more work needs to be done 2018-10-09 21:36:25 +03:00
andreykproductengine 13126a27f1 SL-9733 Perfomance trweak. Should be incompatible with normal filters but far faster. 2018-10-02 14:17:27 +03:00
Rider Linden 78866b33a9 Merge 2018-09-26 13:46:45 -07:00
maxim_productengine 92dc9ceb83 SL-9676 EEP Pick:SELECT SETTINGS limit folder operations options 2018-09-24 16:36:01 +03:00
maxim_productengine 4dd88ee738 MAINT-8803 Better UI handling of unrecognized inventory items 2018-08-01 17:41:34 +03:00
Rider Linden 26b6cc5160 MAINT-8821: Clean up some of the selection and enable/disable code, Add menu for adding settings. 2018-07-09 17:06:24 -07:00