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

261 Commits (0a0e2fe93eb37481f5dab31e945f46de2f3f2d42)

Author SHA1 Message Date
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 6663bc6f85 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	autobuild.xml
#	indra/llfilesystem/llfilesystem.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llviewercontrol.cpp
 2021-12-16 09:49:35 +01:00
Liny d548067dce Make disabled lists not jump to the top on clicking an element in them. 2021-12-12 19:24:12 -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
Zi Ree 70fd0be39a FIRE-30994 - Show tooltip with profile notes in radar when hovered over N icon 2021-08-21 19:34:45 +02:00
Andrey Kleshchev d07980268f SL-15150 Crash at LLScrollColumnHeader::updateResizeBars 
Looks like mHeader is invalid yet mHeader->updateResizeBars() gets called, decided to validate column pointer
 2021-04-24 22:32:10 +02:00
Andrey Kleshchev d91f3ab6ae SL-15150 Crash at LLScrollColumnHeader::updateResizeBars 
Looks like mHeader is invalid yet mHeader->updateResizeBars() gets called, decided to validate column pointer
 2021-04-24 01:04:23 +03:00
Ansariel 078b8b0e54 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-15 12:32:08 +01:00
Zi Ree edc771b71a FIRE-30725 - Add more group functions to group URL context menu 2021-02-10 14:36:56 +01:00
Beq aca484d2c3 FIRE-30732 - Fix side-effects of deferred sort 
ScrollList now has XUI attribute SortLazily which defaults to False.  The deferral period is defaulted to 5 to reduce false triggers further.
 2021-02-05 01:37:01 +00:00
Ansariel 5bc39cd87d Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-02 17:50:49 +01:00
Andrey Kleshchev 44b6459dfa Merge branch 'master' into DRTVWR-514-keymappings 
# Conflicts:
#	indra/llui/llscrolllistctrl.cpp
 2021-02-01 23:33:41 +02:00
Ansariel 8c7fa542ec Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-01 19:21:56 +01:00
Ansariel e5bd6bab57 Use LLUICachedControl in LLUI instead of LLCachedControl 2021-01-28 23:08:57 +01:00
Beq 68d5be3856 FIRE-30667 - Address problems highlighted by excessive group notices 
The problem itself will be fixed server side these fixes improve general case behaviour and possibly OpenSim
 2021-01-28 18:05:49 +00:00
Ansariel 52b3bb404c Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-01-17 12:38:03 +01:00
Ansariel 84d25e8098 FIRE-30571: Comboboxes select all items then pressing Page-Up 2020-12-11 12:12:58 +01:00
Ansariel 7139d98927 Merge branch 'DRTVWR-514-keymappings' of https://bitbucket.org/lindenlab/viewer 2020-12-07 14:32:23 +01:00
Andrey Kleshchev 65d661bc67 SL-6109 Crash fix for left right selection shift when nothing or whole string is selected 2020-12-03 13:26:44 +02:00
Ansariel 09bcd7ac67 Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer 2020-11-23 19:27:33 +01:00
Andrey Kleshchev f534e37328 SL-14368 Expanding the 'People' floater to the right does not expand the displayed values 2020-11-21 00:06:47 +02:00
Ansariel a1d9d8b7ea Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-10-15 12:19:54 +02:00
Ansariel b834664d81 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-10-15 11:31:36 +02:00
Andrey Lihatskiy 80dd72ff2b Merge branch 'master' into DRTVWR-514-keymappings 2020-10-14 22:00:09 +03:00
Andrey Lihatskiy 14bf268fbb Merge branch 'master' into DRTVWR-513-maint 2020-10-14 21:59:52 +03:00
Ansariel de246a77b1 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-07-28 23:46:20 +02:00
Ansariel db68f49ab5 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-07-28 21:01:43 +02:00
Ansariel 69b005b149 Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer 2020-07-15 16:41:49 +02:00
Andrey Kleshchev 54383cac8f SL-5894 #3 WIP enumerate devices to flaoter, let floater set device 
temp
 2020-07-15 13:55:32 +03:00
Ansariel 24f83da506 FIRE-29862: Add a way to select all gestures (and other stuff as well) 2020-07-14 15:46:45 +02:00
Ansariel ebe141327c Merge branch 'DRTVWR-514-keymappings' of https://bitbucket.org/lindenlab/viewer 2020-06-24 10:30:51 +02:00
andreykproductengine af7cefe031 SL-6109 Cell selection support 2020-06-23 14:49:39 +03:00
andreykproductengine 4df05c5a89 SL-6109 Keyaboard support ready 2020-06-23 14:48:02 +03:00
Ansariel 48854f714a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-03-19 10:28:54 +01:00
Andrey Lihatskiy 9ec2aac56c Merge branch 'master' into DRTVWR-482 2020-03-18 21:05:33 +02:00
Ansariel 90cbec4a54 Merge DRTVWR-481 2020-02-08 18:43:22 +01:00
Andrey Lihatskiy 258cc9c61a Merge branch 'master' into DRTVWR-482 2020-02-05 18:31:06 +02:00
Ansariel ee65b14ec8 Merge DRTVWR-482 2020-01-29 17:22:18 +01:00
Brad Payne (Vir Linden) 38649767a0 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer-private into DRTVWR-481 
Merge
 2020-01-28 21:47:35 +00:00
andreykproductengine c5859778bc SL-379 WIP Joint overrides tab 2020-01-17 21:08:38 +02:00
andreykproductengine 9621dd8bbd SL-12100 Premium Enhancements - Changes to rates to create Groups, UI Work 2019-11-22 20:18:30 +02:00
Ansariel 3bc189bda7 Merge Firestorm LGPL 2019-11-19 20:28:09 +01:00
Ansariel fd4b8a7bb1 Merge Firestorm LGPL 2019-11-12 18:45:02 +01:00
Ansariel d79b79fbe2 Merge viewer-ordered-shutdown 2019-10-19 03:16:10 +02:00
Ansariel e8b426d1c2 Merge viewer-neko 2019-09-11 17:34:55 +02:00
andreykproductengine 98b28e5881 SL-11910 [Win] Horizontal scroll 2019-09-10 19:49:15 +03:00
Ansariel 06fa762f21 FIRE-24051: Fix removing resident from filtered blocklist sends viewer into loop 2019-06-02 19:19:26 +02:00
maxim_productengine cdef4175d4 MAINT-8985 Added missed initialization 2018-08-23 14:53:46 +03:00