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

166 Commits (2bc4fb2bf0bef5adf709ef1fc90ba1bcdee7f8d0)

Author SHA1 Message Date
Ansariel 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
Maxim Nikolenko 51142d1341 Merge branch 'main' into DRTVWR-567 
# Conflicts:
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llpanelmaininventory.cpp
 2023-02-03 16:53:33 +02:00
Kitty Barnett 1140ae3489 Add a texture inspector and show it when hovering over an inventory textory (or folder containing - among others - exactly one texture) and when hovering over notecard embedded textures 2023-02-01 16:38:47 +02:00
Ansariel a9c29b4b81 Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llui/lllineeditor.cpp
#	indra/llui/llmenugl.cpp
#	indra/llui/llmenugl.h
#	indra/llui/lltexteditor.cpp
#	indra/newview/llfloaterbump.cpp
#	indra/newview/llfloaterbump.h
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llnetmap.cpp
 2022-10-20 10:51:25 +02:00
Rye Mutt b9552e596f Reduce folderview menu bloat via lazy creation on right click 2022-10-19 16:21:05 -04:00
Ansariel 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
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
Ansariel 0a0e2fe93e Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00
Ptolemy b70614bd87 SL-16606: Add profiler category UI 2022-01-14 11:50:21 -08:00
Ansariel 63cc972499 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llappearance/lldriverparam.h
#	indra/llcommon/llmemory.h
#	indra/llcommon/llprofiler.h
#	indra/llrender/llvertexbuffer.cpp
#	indra/llwindow/llwindow.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/lldrawable.cpp
#	indra/newview/lldrawable.h
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/lldrawpooltree.cpp
#	indra/newview/lldrawpoolwater.cpp
#	indra/newview/llface.cpp
#	indra/newview/llinventoryfilter.cpp
#	indra/newview/llselectmgr.h
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llvieweroctree.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/llvowlsky.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/floater_stats.xml
 2021-11-12 17:31:39 +01: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
Ansariel 2253723705 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-07-21 14:13:23 +02:00
Andrey Lihatskiy 9873e7bba9 Merge branch 'master' into DRTVWR-527-maint 2021-07-19 22:22:32 +03:00
Ansariel 885215519d Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-04-12 11:56:45 +02:00
Andrey Kleshchev 5e134b4732 SL-13182 Fix root folder's state 2021-04-09 17:19:43 +03:00
Ansariel 14fb8f66f8 Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2020-09-24 16:34:12 +02:00
Andrey Kleshchev 0d7f6d917a SL-13729 Performance of LLUI and LLRender2D #3 2020-09-18 17:27:12 +03:00
Andrey Kleshchev a5c8b1cbe2 SL-13729 Performance of LLUI and LLRender2D #2 2020-09-17 20:39:45 +03:00
Ansariel 0007ff2660 Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer 2020-05-07 12:29:58 +02:00
Andrey Kleshchev 59433e3132 SL-13119 Made control settings cached and fixed potential filtering issue 2020-04-30 16:32:16 +03:00
Ansariel 22dd92e012 Merge Firestorm 2020-02-21 11:53:36 +01:00
Ansariel f7b56e6f7c FIRE-19933: Wire up context menu key in inventory (and other folder views) 2020-02-16 01:46:08 +01:00
Ansariel 0b6b4c7097 Merge Firestorm LGPL 2019-11-15 19:05:26 +01:00
Dave Houlton dc1453af9c Merge in from viewer-release 6.3.5 2019-11-13 16:46:27 -07:00
Ansariel d79b79fbe2 Merge viewer-ordered-shutdown 2019-10-19 03:16:10 +02:00
andreykproductengine c61d0f4297 DRTVWR-493 LLUI to LLParamSingleton 2019-08-10 15:31:03 +03:00
Ansariel f8ad1551b3 Merge viewer-eep 2019-02-10 13:12:23 +01:00
andreykproductengine c8d8414b3b SL-10509 EEP Settings Picker gets closed by drag&drop 2019-02-08 19:06:20 +02:00
Ansariel e2c94f3454 Merge viewer-eep 2018-09-27 21:24:30 +02:00
maxim_productengine 92dc9ceb83 SL-9676 EEP Pick:SELECT SETTINGS limit folder operations options 2018-09-24 16:36:01 +03:00
Ansariel 59fa77d2d9 Fix next item gets selected if cutting in inventory 2018-01-11 13:02:46 +01:00
Ansariel 2347b25808 Merge viewer-neko 2017-06-09 11:49:10 +02:00
Kitty Barnett d7edeb2df8 STORM-2149: Add a warning notification when deleting a folder of filtered content 2017-06-02 16:44:00 +02:00
Ansariel 54ad513fcb Merge viewer-bear 2016-06-24 11:35:43 +02:00
andreykproductengine aff8dcea75 MAINT-85 Using mouse scroll while renaming item moves it out of My Inventory tab 2016-06-16 20:46:53 +03:00
Ansariel 04039bd5df Merge viewer-bear 2016-06-16 00:05:04 +02:00
Ansariel e3e8726553 Merge 2016-06-14 14:06:45 +02:00
andreykproductengine 3fe660d455 MAINT-85 changes should not be lost 2016-06-09 21:11:24 +03:00
Ansariel d10a87d6fb FIRE-14223: First-round fix for using mouse scroll while renaming an item moves line editor out of inventory floater: Finish renaming and accept changes when using the scroll wheel (identical behavior to clicking the up/down buttons and Windows Explorer) 2016-06-09 19:12:07 +02:00
andreykproductengine 256c25bd25 MAINT-85 Using mouse scroll while renaming item moves it out of My Inventory tab 2016-06-08 17:12:21 +03:00
Ansariel f68896905b Merge Firestorm LGPL 2016-05-23 16:09:09 +02:00
AndreyL ProductEngine b25a22a2c1 Merged in lindenlab/viewer-release 2016-05-19 23:02:37 +03:00
Ansariel 2889c5bf40 Merge viewer-bear 2016-05-09 17:24:00 +02:00
andreykproductengine b493edd2c3 MAINT-204 Fixed Top folder is expanded when my inventory filter is changed 2016-04-27 18:06:57 +03:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Ansariel 6c9a672b7e Merge LL Viewer 3.8.2 2015-08-03 20:10:04 +02:00
AndreyL ProductEngine f5d22358d2 MAINT-5432 MAINT-5440 FIXED Crash 
in LLUUID::operator==(LLUUID const &) and  LLFolderView::removeSelectedItems()
 2015-07-28 09:01:20 +03:00
Ansariel ebf54d4b2d Merge with Viewer-VMM 2015-07-15 14:23:19 +02:00
Merov Linden 5cd0e7cf90 Pull merge from lindenlab/viewer-release 2015-05-29 17:11:37 -07:00