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

282 Commits (68c04f41ad65b6bdd1fb74c78ebf213bfaa5b498)

Author SHA1 Message Date
Ansariel 2507bc6137 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-09-15 20:37:16 +02:00
Ansariel 31c5ca5e82 Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer 2022-08-04 16:52:34 +02:00
Mnikolenko Productengine 3f3735c1f8 SL-17851 Highlight matching notifications when using Search Box in Preference 2022-08-02 14:59:04 +03:00
Ansariel 7d7aff4377 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
#	indra/newview/llinventorymodel.h
 2022-05-28 23:00:17 +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
Ansariel a74de2d794 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 19:14:31 +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 eeb1ead040 Skip searching in filtered rows 2022-02-09 10:35:45 +01:00
Ansariel 0e90e53231 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-02-09 10:31:16 +01:00
Andrey Kleshchev 6987dcfd62 SL-11011 Multiselect, scroll to selection and search fix for estate's ban list 2022-02-02 20:44:08 +02:00
Ansariel 6638d1d367 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-01-26 12:31:20 +01:00
Andrey Kleshchev e129986a49 SL-3007 Ability to report abuse from chat 2022-01-24 23:37:21 +02:00
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 95db09d8d0 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-530 
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llkeyconflict.cpp
 2022-01-10 23:31:49 +01:00
Andrey Lihatskiy 469ce7f7f6 Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK 
# Conflicts:
#	indra/newview/app_settings/key_bindings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llkeyconflict.cpp
 2022-01-10 23:51:52 +02:00
Ansariel 496156073b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-12-16 18:56:31 +01:00
Ansariel 39f272278c Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/media_plugins/cef/media_plugin_cef.cpp
 2021-12-16 10:20:56 +01: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
Ansariel 35398057a4 Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-10-22 23:24:38 +02:00
Andrey Kleshchev b41f6cd2b5 SL-15387 Resolve some columns crashes 
Looks like mColumnsIndexed had dead pointers which resulted in a crash and there is some kind of hard to trigger interaction with searchable UI
 2021-10-22 00:01:05 +03:00
Ansariel 1536fdd1c3 Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer 2021-08-24 10:47:18 +02: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 Lihatskiy 3a476a8296 Merge branch 'master' into DRTVWR-530-maint 2021-07-19 22:22:42 +03:00
Mnikolenko Productengine 9df87dd365 SL-13179 FIXED Sorting residents banned on the parcel by duration is incorrect 2021-05-27 23:51:59 +03: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