63df00d4e5
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lllayoutstack.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelwearing.h
# indra/newview/llviewermessage.cpp
2023-05-17 20:35:53 +02:00
4d3a8f4a6c
SL-19649 Don't update bounding rect excesively
2023-05-12 22:15:56 +03:00
17e18aa9bf
SL-19649 add missing update
2023-05-12 16:55:12 +03:00
077841420c
SL-19649 reduce logging out time for larger inventories
2023-05-12 16:35:27 +03:00
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
6ada89ce0b
SL-19117 Extend texture preview to show thumbnails when present
2023-02-01 16:38:47 +02:00
0a0e2fe93e
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-15 02:39:07 +01:00
b70614bd87
SL-16606: Add profiler category UI
2022-01-14 11:50:21 -08:00
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
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
94534f4c88
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-30 23:25:06 +02:00
3f31901640
Merge master (DRTVWR-515) into DRTVWR-516-maint
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/llcoros.cpp
# indra/llmessage/llcoproceduremanager.cpp
# indra/newview/llfloaterfixedenvironment.cpp
# indra/newview/llfloaterimsessiontab.cpp
2021-04-29 21:00:25 +03:00
1570415819
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-10-15 13:51:44 +02:00
9f93f28aab
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-10-15 13:07:37 +02:00
8e5739b3ff
Replace BOOST_FOREACH with c++ ranged-based loop in LLView
2020-09-30 14:58:43 +02:00
83822fd199
Merge branch 'master' into DRTVWR-516-maint
...
# Conflicts:
# indra/newview/llvocache.cpp
2020-09-28 22:39:06 +03:00
1d458de949
Merge branch 'master' into DRTVWR-515-maint
...
# Conflicts:
# indra/newview/llpanelprimmediacontrols.cpp
2020-09-28 22:29:19 +03:00
14fb8f66f8
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2020-09-24 16:34:12 +02:00
e6e844a0b9
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-23 14:01:45 +02:00
0d7f6d917a
SL-13729 Performance of LLUI and LLRender2D #3
2020-09-18 17:27:12 +03:00
a5c8b1cbe2
SL-13729 Performance of LLUI and LLRender2D #2
2020-09-17 20:39:45 +03:00
240757c0d0
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2020-08-20 16:52:04 +02:00
8b33f3df14
Revert half-implemented "SL-11172 Scroll to focused object if object is not in visible area" that sneaked in during the transition to Git (will be fully implemented in DRTVWR-503)
...
This reverts commit 941c1ee7f8
2020-08-20 10:46:31 +02:00
cfe0ba9035
Merge branch 'master' into DRTVWR-515-maint
...
# Conflicts:
# indra/newview/llimprocessing.cpp
2020-08-18 19:16:03 +03:00
e67e9f63c3
SL-13293 Fixed reshape behavior for scale change
2020-08-14 01:06:48 +03:00
9406b757a3
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# Conflicts:
# indra/cmake/DirectX.cmake
# indra/newview/llviewerparcelmedia.cpp
# indra/newview/viewer_manifest.py
2020-08-11 01:34:13 +03:00
67255f5d64
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501
2020-07-29 13:23:00 +02:00
350cf703a1
Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer
2020-07-24 00:44:20 +02:00
3f48ab1c05
SL-13642 Get rid of that ugly ignore -Wdelete-incomplete
...
Get rid of that ugly '#pragma clang diagnostic ignored "-Wdelete-incomplete"' by making sure the delete always happens inside llview.cpp, where the type of LLView is known.
2020-07-23 00:46:20 +03:00
6afd505fa8
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-05 15:24:10 +02:00
80447f5e6b
SL-11172 Re-fixed, now should affect 'tab' only
2020-04-13 15:06:11 +03:00
e0727702ea
Merge branch 'DRTVWR-501' into trunk
2020-02-03 15:18:34 +02:00
c2d9c3f634
Merge viewer-neko
2020-01-29 19:07:49 +01:00
941c1ee7f8
SL-11172 Scroll to focused object if object is not in visible area
2020-01-09 20:54:36 +02:00
95af08341c
Buildfix
2019-11-28 00:51:05 +02:00
56056aa198
Upstream merge from viewer-neko
2019-11-27 23:20:03 +02:00
a154630ecd
Merge 494-maint-wassail
2019-11-19 21:51:54 +01:00
3bc189bda7
Merge Firestorm LGPL
2019-11-19 20:28:09 +01:00
a3737fa1c4
Fix viewer hang at exit
2019-11-13 17:04:27 +01:00
5f731d84cb
Downstream merge from 494-maint-wassail
2019-11-12 02:37:15 +02:00
e96d0d5e30
Buildfix
2019-11-12 01:59:44 +02:00
84f3b2865f
Merged in lindenlab/viewer-release
2019-11-12 00:39:07 +02:00
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
e8b426d1c2
Merge viewer-neko
2019-09-11 17:34:55 +02:00
98b28e5881
SL-11910 [Win] Horizontal scroll
2019-09-10 19:49:15 +03:00
c61d0f4297
DRTVWR-493 LLUI to LLParamSingleton
2019-08-10 15:31:03 +03:00
529569cdd9
Merge viewer-neko
2019-08-04 12:09:33 +02:00
b1b102cf66
SL-8380 Ability to disable 2D UI tooltips
2019-07-26 21:10:01 +03:00
c182741596
Merge viewer-lynx
2016-11-16 09:55:54 +01:00
7fceb3a63f
Merged in lindenlab/viewer-cleanup
2016-11-14 22:04:37 +02:00
Ansariel