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

533 Commits (ccb1dfa0724ebca082540f338685fe3f9fd18f43)

Author SHA1 Message Date
Ansariel ccb1dfa072 Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
 2023-05-02 20:11:20 +02:00
Andrey Kleshchev 895ce616ea SL-19652 Fixed 'working' cursor flicker 2023-04-25 22:49:33 +03:00
Ansariel 130ac29ea6 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-02-03 12:58:42 +01:00
Andrey Lihatskiy 7a5381b39f Merge branch 'main' into DRTVWR-573-maint-R 2023-02-02 21:51:07 +02:00
Ansariel b157ab47c0 Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/newview/llagentui.cpp
#	indra/newview/llcallingcard.cpp
#	indra/newview/llfloateravatarrendersettings.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llimview.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/skins/default/xui/de/floater_tools.xml
#	indra/newview/skins/default/xui/en/floater_display_name.xml
#	indra/newview/skins/default/xui/en/floater_tools.xml
#	indra/newview/skins/default/xui/es/floater_tools.xml
#	indra/newview/skins/default/xui/ru/floater_tools.xml
 2023-01-12 16:56:08 +01:00
Maxim Nikolenko 8496ae48dd
SL-18807 FIXED Viewer crashes when trying to purge item using 'Pick: Select settings' floater 2022-12-08 15:07:10 +02:00
Ansariel 8f45ad9323 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-11-22 16:29:17 +01:00
Zi Ree a5df39feb1 FIRE-31369: Add inventory filter for coalesced objects 2022-11-15 19:01:46 +01: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 76a2d68983 FIRE-15861: Fix attach/detach/take off/wear option not working properly from context menu in partial inventory window 2022-09-01 19:53:19 +02: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 c2f8517118 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 21:01:05 +01:00
Dave Houlton 353329c2c2 DRTVWR-546 merge in master v6.5.1 2021-11-16 11:44:55 -07:00
Ansariel f00647b6fd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 15:38:25 +01: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
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 44d78f3dbe Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-06-27 16:18:42 +02:00
Ansariel 7b5f815b94 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-06-27 15:01:27 +02: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
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
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
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
Ansariel 2ff2a32cfc Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-03-03 23:40:00 +01:00
Ansariel d36f1c75ad Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer 2021-03-03 15:08:10 +01:00
Ansariel fc9bedbe78 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-03-03 10:39:48 +01:00
Mnikolenko Productengine 5bdc96784c SL-12475 Add the way to reset current Favorites folders 2021-02-23 18:41:15 +02:00
Zi Ree 62dc1ea394 Fixed wrong data type for permissions filter 2021-02-22 01:40:48 +01:00
Zi Ree 763709b101 FIRE-1175 - Filter Permissions Menu, fix filtered folders not hiding 2021-02-21 22:15:54 +01:00
Ansariel 23693c23a7 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-03 23:50:45 +01: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 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
Ansariel 339c3c5df4 Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer 2021-01-18 18:55:37 +01: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
Ansariel ba969c6c4d Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer 2020-11-24 12:11:20 +01: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
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 538e8fb64e Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer 2020-11-05 09:22:31 +01:00