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

290 Commits (3079cda4868fb736d20cd07698a164b109704d47)

Author SHA1 Message Date
Ansariel 3079cda486 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llvoicevivox.h
 2023-02-10 00:50:19 +01:00
Ansariel 9e3079f859 Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/llrender/llfontfreetype.cpp
#	indra/llrender/llfontregistry.cpp
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llworldmapview.cpp
#	indra/newview/skins/default/xui/en/widgets/chat_editor.xml
 2023-01-23 16:49:24 +01:00
Kitty Barnett 3acb4caa0f Add emoji helper support to LLTextEditor 2022-10-23 16:28:35 +02:00
Kitty Barnett 8694f055b6 Add emoji helper support to LLTextEditor 2022-10-23 16:27:06 +02: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
Zi Ree 9fb09ce231 FIRE-32175 - Linux/SDL2: Alt-Tab pushes a tab character into scripts and notecards 2022-10-04 20:47:39 +02:00
Ansariel 8ed636b3a5 Allow Shift-Tab to tab-remove in text editors 2021-12-12 00:18:01 +01:00
Beq a3f4de55b5 FIRE-31081 - Bugsplat crash - null this ptr in setItemVisible. 2021-07-19 12:10:45 +01: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
Ansariel b4ab48c849 Merge viewer-neko 2018-12-13 00:34:43 +01:00
andreykproductengine d998325556 SL-10145 Right clicking on unselected link in editor near selected text shows wrong menu 2018-11-30 17:29:54 +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 0b37538cd2 MAINT-8431 FIXED HTTP URL in the object name is represented as a hyperlink in inventory offer 2018-04-03 11:24:02 +03:00
Tonya Souther 2e644b4911 Compile fixes for Xcode 9 (and probably gcc). 2018-01-27 02:02:16 -06:00
Ansariel 7c41871639 Merge viewer-lynx 2017-04-14 12:42:28 +02:00
Mnikolenko Productengine 4261f6ee11 MAINT-6404 FIXED When pasting from Mac Word into a notecard, line break is replaced by ? 2017-03-22 17:50:04 +02:00
Ansariel 83865d408b FIRE-20054: Only update link's HREF to label text if the user can edit the text 2016-09-06 23:40:49 +02:00
Ansariel a0188a5358 Merge Firestorm LGPL 2016-05-09 12:41:24 +02:00
Oz Linden 950c41d184 merge 4.0.4-release and MAINT-5974 2016-05-06 10:28:42 -04:00
Ansariel df4205dc46 Merge viewer-bear 2016-04-02 03:52:29 +02:00
andreykproductengine 0e845dc845 MAINT-6214 Unable to add a space before closing curly brace in chatbar, notecards & scripts. 2016-03-24 17:09:39 +02:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden 5822fb00b6 merge DRTVWR-398 build cleanup fixes 2016-03-07 12:41:11 -05:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Ansariel 5524d38dff Merge viewer-quickgraphics 2015-10-03 16:38:26 +02:00
Oz Linden 71a468c6fb merge changes for other open sourc contributions 2015-07-30 11:09:00 -04:00
Ansariel adb6c935d2 Add linefeed input support to chat textboxes via Ctrl-Shift-Enter 2015-07-10 14:47:01 +02:00
Ansariel 44858f9051 FIRE-4314: Paste from clipboard shows block character if last character is a linefeed 2015-07-10 11:07:47 +02:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
Mnikolenko ProductEngine 59a6827847 MAINT-4973 FIXED Clicking on the green part of links (as opposed to the grey) opens the wrong link in all places apart from in a conversation window or chat toast. 2015-03-13 15:45:28 +02:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Ansariel 9be423524d Merge LL V3.7.27 2015-04-14 22:08:31 +02:00
Jonathan Yap 2d7fb5c675 STORM-2094 Save button not activated if spelling corrected in Notecard and no other changes made 2014-12-28 09:34:28 -05:00
callum_linden 23711c9275 Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013 2014-12-10 08:44:08 -08:00
Mnikolenko ProductEngine 2801b7392a MAINT-3648 FIXED Allow opening URLs when any text is selected. 2014-12-09 11:46:03 +02:00
Ansariel 1e75b35b4a FIRE-15591: Optional tab remove in text editors; Disable tab remove for chat entry box 2015-02-21 12:56:03 +01:00
Ansariel 48fc17d6e1 Merge LL V3.7.16 2015-01-14 17:36:30 +01:00
Ansariel a45088cb6b Merge LL V3.7.11 2015-01-12 12:54:15 +01:00
Ansariel e1ce6e3d58 Merge Firestorm LGPL tip 2015-01-08 23:12:58 +01:00
Ansariel f4bfb1aadf Merge LL V3.7.9 (AIS3 + SSA) 2014-10-22 02:02:08 +02:00
andreykproductengine 7982ae6b91 MAINT-3967 FIXED Up arrow key does not move the cursor up in chat field. 
Reverted previous two fixes and modified LLTextBase::changeLine()
 2014-08-28 19:36:47 +03:00
andreykproductengine 208fe31200 MAINT-3967 FIXED Up arrow key does not move the cursor up in chat field. 
Reverted previous two fixes and modified LLTextBase::changeLine()
 2014-08-28 19:36:47 +03:00
simon bfa42c9e28 Merge downstream code and become 3.7.12 2014-07-07 16:17:53 -07:00
simon 3e6698073c Merge viewer-release and become version 3.7.12 2014-07-07 14:49:45 -07:00
maksymsproductengine f8627d4342 MAINT-3967 FIXED Up arrow key does not move the cursor up in chat field. 2014-06-18 20:23:34 +03:00
simon d760a6889d Merge downstream code 2014-06-18 19:02:25 -07:00
simon 592024b580 Merge viewer-release and become version 3.7.9 2014-06-17 10:40:42 -07:00