Ansariel
|
9ee1a75474
|
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcommon/lluuid.cpp
# indra/llcommon/lluuid.h
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llscrolllistctrl.h
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersettingsdebug.h
# indra/newview/skins/default/xui/en/floater_settings_debug.xml
# indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
|
2022-11-01 17:17:56 +01:00 |
|
Mnikolenko Productengine
|
8de9beeb6f
|
SL-18388 Searchable debug settings UI
|
2022-10-24 21:46:14 +03: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
|
bbd8df15de
|
Fix menu leaks and lazy creation in text editing and scroll lists
|
2022-10-19 16:28:03 -04:00 |
|
Ansariel
|
2507bc6137
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-09-15 20:37:16 +02:00 |
|
Andrey Lihatskiy
|
b5861e58cb
|
Merge branch 'master' into DRTVWR-565-maint-P
|
2022-09-15 20:43:02 +03: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 |
|
Andrey Lihatskiy
|
9b0569840f
|
Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
|
2022-05-31 01:58:09 +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 |
|
Andrey Lihatskiy
|
1e0eafd50c
|
Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/llviewerregion.cpp
|
2022-02-28 21:56:25 +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 |
|
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 |
|
maxim_productengine
|
36594400a2
|
MAINT-8985 FIXED User is able to send friendship request to a friend from the group menu
|
2018-08-22 18:02:31 +03:00 |
|
Ansariel
|
01dddbd231
|
FIRE-19933: Open context menu on context menu key press in LLScrollListCtrls
|
2019-01-26 23:40:05 +01:00 |
|
Ansariel
|
d93b92ec1d
|
Merge viewer-bear
|
2018-09-12 20:13:12 +02:00 |
|
Ansariel
|
106d34da3a
|
Merge viewer-neko
|
2018-06-12 21:54:15 +02:00 |
|
Graham Linden
|
b26dbf562f
|
MAINT-8741 fix compile issue with OSX 10.14 SDK
|
2018-06-08 17:29:56 +01:00 |
|
Ansariel
|
c4e18fbcaa
|
Merge viewer-neko
|
2018-02-27 18:08:48 +01:00 |
|
maxim_productengine
|
52eb540cca
|
MAINT-8287 FIXED [Mac] Crash when creating group role with 'Manage ban list' ability
|
2018-02-14 11:37:07 +02:00 |
|
Ansariel
|
00bfcbec08
|
FIRE-21887: Select first visible item in scroll list if previously selected item gets filtered
|
2017-11-30 10:18:29 +01:00 |
|
Ansariel
|
2347b25808
|
Merge viewer-neko
|
2017-06-09 11:49:10 +02:00 |
|
Mnikolenko Productengine
|
81f4da6468
|
MAINT-7447 FIXED Selecting a group ability refreshes the list and deselects your choice
|
2017-06-06 12:47:51 +03:00 |
|
Nicky
|
e9c3e25ca7
|
Crash fix in case column already went away (not sure how it happens, but it does).
|
2017-06-06 10:55:04 +02:00 |
|
Ansariel
|
bff6a3af15
|
Merge viewer-neko
|
2017-02-23 09:02:58 +01:00 |
|
Mnikolenko Productengine
|
a6b3bb1a2d
|
MAINT-7146 No callback for 'Url.RemoveFriend' in LLScrollListCtrl
|
2017-02-20 14:20:43 +02:00 |
|
andreykproductengine
|
07cc16f479
|
MAINT-2001 Fixes colums misbeheaving
|
2017-02-06 17:29:45 +02:00 |
|
Ansariel
|
dd69a22834
|
Merge viewer-bear
|
2017-01-27 09:42:51 +01:00 |
|
andreykproductengine
|
187caf8515
|
MAINT-2001 Fixed the width of columns cannot be changed in Inspect Object
|
2017-01-11 13:07:01 +02:00 |
|
Ansariel
|
b6227f59ae
|
FIRE-20362: Scroll bar in scroll list does not update on filtering
|
2016-11-17 22:08:31 +01:00 |
|
Ansariel
|
a0188a5358
|
Merge Firestorm LGPL
|
2016-05-09 12:41:24 +02:00 |
|
Ansariel
|
08a3c121ca
|
Build fix
|
2016-03-17 23:41:57 +01:00 |
|
Ansariel
|
3192fe832f
|
Merge viewer-quickgraphics
|
2016-03-08 01:41:31 +01:00 |
|
Ansariel
|
fc31cf7a29
|
Fix initialization order in LLScrollListCtrl: Can only set sort column after we created the actual columns
|
2015-11-27 18:42:50 +01:00 |
|
Oz Linden
|
c8726aba30
|
remove execute permission from many files that should not have it
|
2015-11-10 09:48:56 -05:00 |