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

148 Commits (cbf6aca2e8ebd32d29b70f2d582044153da05eab)

Author SHA1 Message Date
Ansariel 0a928bf1fd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/CMakeLists.txt
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llagent.cpp
#	indra/newview/llfloaternewfeaturenotification.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/llsidepaneltaskinfo.cpp
#	indra/newview/llsidepaneltaskinfo.h
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/llviewerinventory.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llviewertexturelist.h
#	indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
 2023-10-04 11:38:21 +02:00
Ansariel fc5a86a6cc Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventoryobserver.cpp
#	indra/newview/llinventoryobserver.h
 2023-08-25 01:19:32 +02:00
Ansariel 4b923d4291 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	.github/workflows/build.yaml
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llviewerregion.h
 2023-08-24 20:48:55 +02:00
Ansariel 5c357d3690 Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llcommon/stdtypes.h
#	indra/newview/llimprocessing.cpp
 2023-06-27 11:44:12 +02:00
Alexander Gavriliuk 45a54ba544 SL-18328 Fix opening the right profile on click Callingcard embedded to a Notecard 2023-06-07 10:58:24 +02:00
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
Ansariel 73e5615d43 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/llimagej2coj/llimagej2coj.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/app_settings/shaders/class1/deferred/skyF.glsl
#	indra/newview/app_settings/shaders/class1/deferred/skyV.glsl
#	indra/newview/app_settings/shaders/class2/deferred/skyF.glsl
#	indra/newview/llsettingsvo.cpp
 2023-02-03 11:11:13 +01:00
Andrey Kleshchev 6ada89ce0b SL-19117 Extend texture preview to show thumbnails when present 2023-02-01 16:38:47 +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 9ee1a75474 Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llcharacter/llkeyframemotion.cpp
#	indra/llcommon/lluuid.cpp
#	indra/llcommon/lluuid.h
#	indra/llui/llscrolllistctrl.cpp
#	indra/llui/llscrolllistctrl.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersettingsdebug.cpp
#	indra/newview/llfloatersettingsdebug.h
#	indra/newview/skins/default/xui/en/floater_settings_debug.xml
#	indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
 2022-11-01 17:17:56 +01:00
Andrey Lihatskiy 91f9f2e9f7 DRTVWR-570 Mac build fix: unused variables cleanup 2022-10-27 23:08:09 +03:00
Ansariel 5763aa32cc Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/newview/llreflectionmapmanager.cpp
#	indra/newview/llsettingsvo.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/pipeline.cpp
 2022-10-12 16:25:18 +02:00
Andrey Kleshchev 2fa8bce1cf SL-18326 GLTF material functionality in a Notecard 2022-10-08 01:14:22 +03:00
Ansariel 29cf23c852 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-30 09:43:24 +02:00
Ansariel c85bcbd7de FIRE-29425: User-selectable font and size for notecards 2022-08-16 18:27:13 +02:00
Ansariel 45fd8ee26b Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-06-30 17:49:59 +02:00
Dave Parks fd6b5ea8c3 SL-17685 Drag and drop material support WIP 2022-06-29 17:59:09 -05: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 1733550573 Merge viewer-eep 2018-09-22 00:42:04 +02:00
maxim_productengine 0b3a4c7556 MAINT-8910 FIXED EEP - clicking at settings embedded into notecard does nothing 2018-08-28 18:18:36 +03:00
andreykproductengine 80f98daed9 MAINT-8842 Should not be able to add Environment Setting Assets to Group Notices on a Non-EEP region 2018-07-19 22:27:49 +03:00
Rider Linden 442bbfed34 Adding settings DAD type 2018-06-20 12:37:17 -07:00
Rider Linden cbe4cac78c Settings type inventory objects and upload the assests. 2018-03-06 14:58:39 -08:00
Ansariel 95fcf065c1 Merge viewer-bear 2017-04-19 21:43:58 +02:00
andreykproductengine e26c68c187 MAINT-7267 Fixed UI missing last symbol of string on hi-res monitors. 2017-04-06 21:29:43 +03:00
andreykproductengine b7c909367e MAINT-7267 Fixed UI missing last symbol of string on hi-res monitors. 2017-04-06 21:29:43 +03:00
Ansariel dd69a22834 Merge viewer-bear 2017-01-27 09:42:51 +01:00
andreykproductengine 8ef99c38a5 MAINT-918 Newline was not displayed correctly in chat window. 2017-01-04 18:38:52 +02:00
Mnikolenko Productengine a79ac1be4d MAINT-897 show confirmation dialog when copying notecard 2017-01-04 11:15:38 +02:00
Ansariel d171e16c58 Merge Firestorm LGPL 2016-03-18 10:16:25 +01:00
Oz Linden 31f3db0291 merge changes for DRTVWR-417 2016-03-16 13:08:06 -04:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Ansariel 063ec52083 Merge Firestorm LGPL tip 2016-02-13 13:43:08 +01:00
Ansariel d58d2e2c20 Consolidate check for standalone place details floater into FSFloaterPlaceDetails 2016-02-04 11:41:57 +01:00
Ansariel e7ade840e4 Merge viewer-bear 2016-01-24 14:00:30 +01:00
andreykproductengine c73d9e5c44 MAINT-5984 FIXED Incorrect cursor position with UI scale >1.0 2015-12-29 20:20:40 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Nicky 40c5ed2f0e Fix merge error. 2015-05-05 18:11:41 +02:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
callum_linden 577a3973ea Update to build on Xcode 6.0: Large (and final) collection of fixes for unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake 2014-10-20 14:00:39 -07:00
AndreyL ProductEngine 403d569adc MAINT-3981 FIXED [SECURITY] Notecard being passed around that crashes any V3 based viewer when opened. 
Correct fix after testing.
 2014-05-09 05:15:54 +03:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
AndreyL ProductEngine 507280d4c8 MAINT-3981 FIXED [SECURITY] Notecard being passed around that crashes any V3 based viewer when opened. 
Correct fix after testing.
 2014-05-09 05:15:54 +03:00
Ansariel 4408b5aef9 Backed out changeset: e7b5cfccef68 - Make room for official crash fix from Linden Lab 2014-05-11 11:52:16 +02:00
ziree 48a0a7db52 Fix notecard crasher with invalid embedded asset type. FIRE-13558 2014-04-25 15:01:47 +02:00