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
7075717b7c
SL-20363 Add Advanced option 'Debug Unicode'
2024-02-08 13:17:18 +03:00
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
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
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
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
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
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
c37140dd89
SL-19995 FIXED The context menu is not fully displayed for the navigation bar
2023-07-17 18:05:10 +03:00
1fe007abef
SL-20001 EmojiPicker - make the preview to be a panel instead of a button
2023-07-13 22:13:31 +02:00
7732257ea5
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
2022-11-02 13:05:00 +01:00
31115dac2c
Merge remote-tracking branch 'RyeMutt/viewer/minor-fixes' into DRTVWR-570-maint-Q
2022-11-01 23:12:58 +02:00
8669f3f4c2
Fix line editors deselecting when pressing capslock
2022-10-30 06:59:54 -04:00
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
bbd8df15de
Fix menu leaks and lazy creation in text editing and scroll lists
2022-10-19 16:28:03 -04:00
22b72a328b
Slight optimization
2022-09-14 14:20:40 +02:00
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
603e04ee3c
Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 13:18:55 +02:00
7c179b8e7d
SL-15346 Small adjustment
2021-06-07 21:19:47 +03:00
024032c674
SL-15346 "Listing ID" field has OS-dependent length restriction
2021-06-05 00:22:20 +03:00
6afd505fa8
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-05 15:24:10 +02:00
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
80447f5e6b
SL-11172 Re-fixed, now should affect 'tab' only
2020-04-13 15:06:11 +03:00
0b6b4c7097
Merge Firestorm LGPL
2019-11-15 19:05:26 +01:00
dc1453af9c
Merge in from viewer-release 6.3.5
2019-11-13 16:46:27 -07:00
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
c61d0f4297
DRTVWR-493 LLUI to LLParamSingleton
2019-08-10 15:31:03 +03:00
24acb7d5c3
Fix some line-endings to be newline only.
2019-05-03 14:58:51 -07:00
f67fe8fce7
SL-10833 Restore missing code after a merge
2019-05-02 13:45:40 +03:00
c35758512e
Merge Firestorm LGPL
2019-04-18 13:11:23 +02:00
5f8cca95f8
Merge 6.2.1
2019-04-17 11:24:08 -07:00
856cc1082b
Merge LL viewer-release 6.2.0
2019-04-17 17:12:42 +02:00
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
cc577bfa39
Merge viewer-eep
2019-03-31 10:59:37 +02:00
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
34f6702339
FIRE-19933: Open context menu on context menu key press (Windows)
2018-07-13 00:31:07 +02:00
9203b70ca3
Merge viewer-neko
2018-04-07 13:40:21 +02:00
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
c4e18fbcaa
Merge viewer-neko
2018-02-27 18:08:48 +01:00
5ab314bb95
MAINT-8289 FIXED Deleting inventory directory while keeping [Delete] key pressed
2018-02-14 17:55:37 +02:00
2e644b4911
Compile fixes for Xcode 9 (and probably gcc).
2018-01-27 02:02:16 -06:00
c3791746d2
Merge #5 with lgpl.
2017-02-06 12:19:02 +01:00
cd82785561
Fix bug in LLLineEditor where Capslock deselects text, found by Drake Arconis
2016-12-10 12:28:06 +01:00
e2919977d6
Merge viewer-lynx
2016-11-30 11:15:04 +01:00
a3acf2b339
FIRE-20377: LLLineEditor not disabled properly
2016-11-19 10:04:03 +01:00
11c03f8fe3
STORM-2140 LLLineEditor enabled-state cannot properly set via XUI
2016-11-19 16:50:02 +01:00
27a8126dca
Enabling LLLineEditor via XUI breaks enabled-state - correct fix
...
setEnabled intentionally doesn't disable, but is a read-only flag. Make sure
the LLLineEditor is always enabled (calling the base-constructor will disabled it!)
and then call the overloaded setEnabled-Method to apply the read-only flag
2016-11-15 14:28:20 +01:00
6c62088fb8
Enabling LLLineEditor via XUI breaks enabled-state
2016-11-04 18:43:17 +01:00
deb8f582c5
STORM-2140 LLLineEditor enabled-state cannot properly set via XUI
2016-11-16 16:48:56 +02:00
6083fd1cbe
STORM-2140 LLLineEditor enabled-state cannot properly set via XUI
2016-11-07 12:33:14 +02:00
Ansariel