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

279 Commits (7804859af2eb06a6f09094d484341c37feb49f9d)

Author SHA1 Message Date
Ansariel 7804859af2 Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llui/lllineeditor.cpp
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltransutil.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/skins/default/xui/en/panel_landmark_info.xml
#	indra/newview/skins/default/xui/en/strings.xml
 2024-03-27 14:07:32 +01:00
Alexander Gavriliuk 15734c1978 viewer#961 Add a notification appearing when user tries to insert a disallowed character 2024-03-18 21:19:57 +01:00
Ansariel b1a271c3aa Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/ICU4C.cmake
#	indra/llui/lltextbase.h
#	indra/llui/llview.h
#	indra/newview/CMakeLists.txt
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
#	indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
 2024-03-17 17:53:34 +01:00
Alexander Gavriliuk 1781e2d17b viewer#944 Make 'Debug Unicode' feature available for all LLViews 2024-03-10 00:10:16 +01:00
Ansariel 80c3fe0101 Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer 2024-03-05 21:27:49 +01:00
Alexander Gavriliuk 27dd9ee482 triage#86 Use Emoji font in LineEditor by default 2024-03-05 15:37:49 +01:00
Ansariel ac898495ae Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 
# Conflicts:
#	indra/llcommon/llstring.cpp
#	indra/llcommon/llstring.h
 2024-03-04 22:38:34 +01:00
Andrey Lihatskiy b68a05e7c3 Merge branch 'main' into marchcat/x-merge 
# Conflicts:
#	indra/llcommon/llstring.cpp
#	indra/llcommon/llstring.h
 2024-03-04 18:01:05 +02:00
Ansariel 25060135c8 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llviewermenu.cpp
 2024-02-08 16:36:25 +01:00
Alexander Gavriliuk 7075717b7c SL-20363 Add Advanced option 'Debug Unicode' 2024-02-08 13:17:18 +03:00
Ansariel 394c8e17d5 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llfloater.cpp
#	indra/llui/llfloater.h
#	indra/llui/lltextbase.cpp
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/llworldmapview.cpp
#	indra/newview/skins/default/xui/en/floater_emoji_picker.xml
 2024-01-26 00:32:06 +01:00
Alexander Gavriliuk ae91ae43a5 SL-20795 Part of previously typed emojis disappear in the 'Save settings as a preset...' option of the 'Preferences' floater 2024-01-17 04:34:21 +01:00
Ansariel b32cd27b4c Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 
# Conflicts:
#	autobuild.xml
#	indra/cmake/ViewerMiscLibs.cmake
#	indra/llmath/llvolume.cpp
#	indra/newview/fonts/DejaVu-license.txt
#	indra/newview/fonts/DejaVuSans-Bold.ttf
#	indra/newview/fonts/DejaVuSans-BoldOblique.ttf
#	indra/newview/fonts/DejaVuSans-Oblique.ttf
#	indra/newview/fonts/DejaVuSans.ttf
#	indra/newview/fonts/DejaVuSansMono.ttf
#	indra/newview/llviewermenu.cpp
 2023-12-18 19:25:49 +01:00
Ansariel 830c9ce388 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llpanelprofile.cpp
 2023-12-18 19:05:55 +01:00
Andrey Lihatskiy c87850ddab Merge branch 'main' into DRTVWR-591-maint-X 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llspatialpartition.cpp
 2023-12-18 07:57:29 +02:00
Andrey Lihatskiy 793bed7d06 Merge branch 'main' into DRTVWR-489 
# Conflicts:
#	indra/newview/fonts/DejaVu-license.txt
#	indra/newview/fonts/DejaVuSans-Bold.ttf
#	indra/newview/fonts/DejaVuSans-BoldOblique.ttf
#	indra/newview/fonts/DejaVuSans-Oblique.ttf
#	indra/newview/fonts/DejaVuSans.ttf
#	indra/newview/fonts/DejaVuSansMono.ttf
 2023-12-15 07:06:15 +02:00
Ansariel 866e71d1f8 Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llui/lllineeditor.cpp
#	indra/newview/installers/windows/installer_template.nsi
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/lltoastalertpanel.cpp
#	indra/newview/skins/default/xui/en/floater_preview_gesture.xml
#	indra/newview/skins/default/xui/en/panel_group_general.xml
#	indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
#	indra/newview/skins/default/xui/en/strings.xml
 2023-10-21 13:52:40 +02:00
Alexander Gavriliuk ddb2c93818 SL-20463 Rename outfit dialog box accepts emoji characters 2023-10-18 13:32:39 +02:00
Ansariel 3eaa83f4d1 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/skins/default/xui/en/floater_emoji_picker.xml
 2023-07-18 11:53:23 +02:00
Ansariel 63151d5c6d Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/llurlentry.h
#	indra/llui/llurlregistry.cpp
#	indra/llui/llurlregistry.h
#	indra/newview/llviewerinventory.cpp
#	indra/newview/llvoavatarself.h
 2023-07-18 00:16:15 +02:00
Maxim Nikolenko c37140dd89
SL-19995 FIXED The context menu is not fully displayed for the navigation bar 2023-07-17 18:05:10 +03:00
Alexander Gavriliuk 1fe007abef SL-20001 EmojiPicker - make the preview to be a panel instead of a button 2023-07-13 22:13:31 +02:00
Ansariel 7732257ea5 Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 2022-11-02 13:05:00 +01:00
Andrey Lihatskiy 31115dac2c Merge remote-tracking branch 'RyeMutt/viewer/minor-fixes' into DRTVWR-570-maint-Q 2022-11-01 23:12:58 +02:00
Rye Mutt 8669f3f4c2 Fix line editors deselecting when pressing capslock 2022-10-30 06:59:54 -04: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 22b72a328b Slight optimization 2022-09-14 14:20:40 +02:00
Zi Ree a5cb6dab38 Linux/SDL2 - IME support for composing Japanese, Chinese, etc. input. Tested with ibus/mozc giving over-the-top editing with candidate clause selection, Media pages in the internal web browser do not yet have accurate input placement 2022-09-14 11:19:51 +02:00
Ansariel 603e04ee3c Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer 2021-08-24 13:18:55 +02:00
Andrey Kleshchev 7c179b8e7d SL-15346 Small adjustment 2021-06-07 21:19:47 +03:00
Andrey Kleshchev 024032c674 SL-15346 "Listing ID" field has OS-dependent length restriction 2021-06-05 00:22:20 +03:00
Ansariel 6afd505fa8 Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer 2020-05-05 15:24:10 +02:00
Andrey Lihatskiy ec9b989863 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint 
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
 2020-05-05 00:37:16 +03:00
Andrey Kleshchev 80447f5e6b SL-11172 Re-fixed, now should affect 'tab' only 2020-04-13 15:06:11 +03: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
Graham Linden 24acb7d5c3 Fix some line-endings to be newline only. 2019-05-03 14:58:51 -07:00
maxim_productengine f67fe8fce7 SL-10833 Restore missing code after a merge 2019-05-02 13:45:40 +03:00
Ansariel c35758512e Merge Firestorm LGPL 2019-04-18 13:11:23 +02:00
Graham Linden 5f8cca95f8 Merge 6.2.1 2019-04-17 11:24:08 -07:00
Ansariel 856cc1082b Merge LL viewer-release 6.2.0 2019-04-17 17:12:42 +02:00
andreykproductengine d1b649055d SL-10890 Ban duration edit field shows value with a left shift if a large value was set 2019-04-05 22:42:04 +03:00
Ansariel cc577bfa39 Merge viewer-eep 2019-03-31 10:59:37 +02:00
maxim_productengine 3a78da70ad SL-10833 FIXED [EEP] Text in the Sky Altitudes boxes is low contrast and difficult to read. 2019-03-29 17:39:19 +02:00
Ansariel 34f6702339 FIRE-19933: Open context menu on context menu key press (Windows) 2018-07-13 00:31:07 +02:00
Ansariel 9203b70ca3 Merge viewer-neko 2018-04-07 13:40:21 +02:00
maxim_productengine 83de982be9 MAINT-8488 FIXED Favourite location list on login screen is not updated after pressing "Esc" key while in username field 2018-04-05 18:22:15 +03:00