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
|
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
|
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 |
|
Ansariel
|
0e2a827873
|
Merge LL V3.7.30
|
2015-05-27 00:27:29 +02:00 |
|
Nicky
|
006190f2a1
|
Merge with tools update.
|
2015-05-05 13:09:27 +02:00 |
|
Brad Payne (Vir Linden)
|
3ae8a821c3
|
merge
|
2015-04-24 08:55:20 -04:00 |
|
Merov Linden
|
d631f2fd4d
|
Pull merge from lindenlab/viewer-tools-update (includes viewer-release)
|
2015-04-14 13:46:01 -07:00 |
|
Ansariel
|
9be423524d
|
Merge LL V3.7.27
|
2015-04-14 22:08:31 +02:00 |
|
Brad Payne (Vir Linden)
|
32940ee90b
|
merge
|
2015-04-13 17:19:27 -04:00 |
|
Oz Linden
|
a8ef252571
|
merge changes for 3.7.27-release
|
2015-04-13 16:23:36 -04:00 |
|
Merov Linden
|
9ba10bf1f2
|
Merge lindenlab/viewer-tools-update
|
2015-03-16 09:49:57 -07:00 |
|
Brad Payne (Vir Linden)
|
dd7f0e2954
|
MAINT-4980 WIP - moved canAddWearables() to LLAppearanceMgr
|
2015-03-13 16:55:19 -04:00 |
|
Brad Payne (Vir Linden)
|
fb072c9148
|
MAINT-4980 WIP - add context menu filtering based on the selection group
|
2015-03-13 16:38:23 -04:00 |
|
Brad Payne (Vir Linden)
|
64511ce28f
|
SL-103 WIP - comment
|
2015-03-06 16:05:47 -05:00 |
|
Brad Payne (Vir Linden)
|
d44e5b7d9c
|
SL-103 WIP - comment re: possible future work
|
2015-03-06 15:57:11 -05:00 |
|
callum_linden
|
23711c9275
|
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
|
2014-12-10 08:44:08 -08:00 |