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

142 Commits (bdc94eac5cda3dd6700a1cd462178b7ac3c4cfec)

Author SHA1 Message Date
Ansariel 67081f9728 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloater360capture.cpp
 2022-12-12 22:09:54 +01:00
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
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 a74de2d794 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 19:14:31 +01: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 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 dbd7ecc9a4 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-02-02 12:56:43 +01:00
Mnikolenko Productengine 8d329f12d6 SL-16669 FIXED Wrong context menu is opened for objects owned by the group 2022-01-27 19:04:21 +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 1536fdd1c3 Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer 2021-08-24 10:47:18 +02: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
Ansariel 078b8b0e54 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-15 12:32:08 +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
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 a1d9d8b7ea Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-10-15 12:19:54 +02:00
Andrey Lihatskiy 80dd72ff2b Merge branch 'master' into DRTVWR-514-keymappings 2020-10-14 22:00:09 +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 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 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 d93b92ec1d Merge viewer-bear 2018-09-12 20:13:12 +02: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 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
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
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 a7a2970a2a Add option to only sort by a single column in LLScrollListCtrl 2015-09-23 18:48:48 +02:00
Ansariel 84cf02b592 Allow persistance of LLScrollListCtrl sort order 2015-09-23 17:45:40 +02:00