Commit Graph

442 Commits (afdcd356db0a496e8916645eeebc8a03755ee0bd)

Author SHA1 Message Date
Kitty Barnett c40d3351d5 Commit immediately if the user already typed a full shortcode 2022-11-02 19:08:02 +01:00
Kitty Barnett 8d08f417dc Show tooltip when hovering over an emoji text segment (currently will show its shortcode) 2022-10-23 16:29:03 +02:00
Kitty Barnett 063fe5953a Create a separate segment for emoji characters so that we can display them in a slightly larger font size than the surrounding text 2022-10-23 16:26:49 +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
Andrey Lihatskiy b5861e58cb Merge branch 'master' into DRTVWR-565-maint-P 2022-09-15 20:43:02 +03:00
Andrey Lihatskiy 55da4ea8bb Merge branch 'master' into DRTVWR-565-maint-P
# Conflicts:
#	indra/newview/llfloateroutfitsnapshot.cpp
2022-08-31 00:36:22 +03:00
Andrey Lihatskiy 5c18921e9a Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
#	indra/newview/llpanelpicks.cpp
#	indra/newview/llpanelprofile.cpp
2022-08-31 00:16:09 +03:00
Kitty Barnett bab70f6f15 Review + resolve minor issues 2022-08-29 00:01:43 +02:00
Kitty Barnett 5440464a9c Merge branch 'contribution/emoji' 2022-08-28 00:08:38 +02:00
Andrey Kleshchev 4c3f343799 SL-17045 LSL editor cursor position desynchronization
1. Fixed cursor position calculations
2. Fixed selection rect calculation
2022-07-26 19:43: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
Andrey Lihatskiy 2ed401882e Merge branch 'master' into DRTVWR-483
# Conflicts:
#	indra/newview/llviewertexturelist.cpp
2022-05-26 02:56:29 +03: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 e70fe3a50d Merge branch 'master' into DRTVWR-483
# Conflicts:
#	indra/newview/llviewermenu.cpp
2022-02-28 22:01:18 +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
Andrey Kleshchev e129986a49 SL-3007 Ability to report abuse from chat 2022-01-24 23:37:21 +02:00
Ptolemy b70614bd87 SL-16606: Add profiler category UI 2022-01-14 11:50:21 -08:00
Dave Houlton 353329c2c2 DRTVWR-546 merge in master v6.5.1 2021-11-16 11:44:55 -07:00
Andrey Lihatskiy 981cdca0a5 Merge branch 'master' into DRTVWR-483
# Conflicts:
#	indra/llui/lltextbase.h
#	indra/newview/VIEWER_VERSION.txt
2021-11-16 01:34:29 +02:00
Andrey Lihatskiy 30c381406c Merge branch 'master' into DRTVWR-530-maint
# Conflicts:
#	doc/contributions.txt
2021-11-16 01:09:11 +02: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
Andrey Kleshchev bdb4a90e7c SL-16157 Crash at LLFontGL::maxDrawableChars 2021-10-08 02:12:36 +03:00
Andrey Kleshchev f655bb1f27 Merge branch master (DRTVWR-515) into DRTVWR-483
# Conflicts:
#	indra/newview/CMakeLists.txt
#	indra/newview/llpanelpicks.cpp (was replaced with a tab in floater)
2021-05-06 22:13:40 +03:00
Andrey Lihatskiy e5a428f362 Merge branch 'master' into DRTVWR-521-maint 2021-04-30 03:00:32 +03:00
Mnikolenko Productengine a74cadff83 SL-14149 FIXED The text is displayed black after double-clicking on it 2020-10-23 16:05:31 +03:00
Andrey Lihatskiy 42330f2008 Merge branch 'master' into DRTVWR-483 2020-10-14 22:01:05 +03:00
Andrey Lihatskiy b39ad7724f Merge branch 'master' into DRTVWR-515-maint 2020-10-14 22:00:20 +03:00
Andrey Lihatskiy 1d458de949 Merge branch 'master' into DRTVWR-515-maint
# Conflicts:
#	indra/newview/llpanelprimmediacontrols.cpp
2020-09-28 22:29:19 +03:00
Andrey Lihatskiy f4bfaeb45e Merge branch 'master' into DRTVWR-483 2020-09-23 01:48:13 +03:00
Andrey Kleshchev 730af5d488 Merged master (DRTVWR-503) into DRTVWR-482 2020-09-22 22:51:33 +03:00
Andrey Kleshchev e67e9f63c3 SL-13293 Fixed reshape behavior for scale change 2020-08-14 01:06:48 +03:00
Mnikolenko Productengine 0828d7375a SL-12396 FIXED Last line can't be removed if it was selected via triple-clicking 2020-05-08 11:54:58 +03: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 Lihatskiy dcb6b5489d Merge branch 'master' into DRTVWR-483 2020-03-18 21:06:02 +02:00
Andrey Lihatskiy 9ec2aac56c Merge branch 'master' into DRTVWR-482 2020-03-18 21:05:33 +02:00
maxim_productengine b9f0eb54ce SL-12396 Triple clicking text in a textbox / textarea should only select the current line 2020-02-12 12:45:56 +02:00
Andrey Lihatskiy d956c866cf Merge branch 'master' into DRTVWR-483 2020-02-05 18:33:53 +02:00
Andrey Lihatskiy 258cc9c61a Merge branch 'master' into DRTVWR-482 2020-02-05 18:31:06 +02: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
maxim_productengine 3d5ffd0af3 SL-12003 FIXED Viewer Icons do not display in Profiles 2019-12-02 16:28:13 +02:00
AndreyL ProductEngine 56056aa198 Upstream merge from viewer-neko 2019-11-27 23:20:03 +02:00
AndreyL ProductEngine d0c7b4fade Merged in lindenlab/viewer-release 2019-11-27 08:19:22 +02:00
maxim_productengine 4acfc99fa6 SL-12317 UI Changes to Group limits 2019-11-22 18:26:56 +02:00
AndreyL ProductEngine f83ada32f7 Merged in lindenlab/viewer-release 2019-11-13 10:50:25 +02:00
AndreyL ProductEngine 5f731d84cb Downstream merge from 494-maint-wassail 2019-11-12 02:37:15 +02:00
Kitty Barnett d58b530e80 Add text_valign to LLTextBase to specify the vertical alignment within a single document line The existing font_valign property is used as to position the entire document so it's impossible to top align a text editor with each line's text centered within that line's extents 2019-11-07 20:48:20 +01:00
Kitty Barnett b44ade68e6 FIXED Calling LLTextBase::insertStringNoUndo() with more than one segment results in overlapping segment ranges
Text is only inserted into the view model *after* the segments are added so if seg1_pos_start is the current EOF:
  -> 1st segment: getSegIterContaining(seg1_pos_start) returns the last segment and insertSegment() ends up properly adjusting its start/end position
  -> 2nd segment: getSegIterContaining(seg2_pos_start) returns mSegments.end() since its position is beyond the available and insertSegment() leaves the last 2 segments with overlapping ranges
After the fix:
  -> if index runs past the end of all segments then mSegments.end() is returned (no change)
  -> if index is a position past the length of text but claimed by a segment then that segment is returned (change)
  -> if index specifies a position in the middle of the document unclaimed by any segment then the first segment after that position is returned (no change)
     (this does break the assertion that segment->mStart <= index <= segment->mEnd?)
2019-11-07 20:33:53 +01:00
Kitty Barnett 418308bc7c Characters can have more than one representation in LLFontFreetype
* By default all viewer text will use B/W glyphs
  * Added temporary use_color attribute to LLTextBase for testing
2019-11-06 12:34:26 +01:00
andreykproductengine 98b28e5881 SL-11910 [Win] Horizontal scroll 2019-09-10 19:49:15 +03:00
andreykproductengine c61d0f4297 DRTVWR-493 LLUI to LLParamSingleton 2019-08-10 15:31:03 +03:00
AndreyL ProductEngine 3175525950 Merged in lindenlab/viewer-release 2019-05-08 21:41:56 +03:00
AndreyL ProductEngine 93f0023efa Merged in lindenlab/viewer-release 2019-05-08 21:41:11 +03:00
andreykproductengine 9d2cb130e3 SL-11028 [Legacy Profiles] Selection in account field is malfunctioning 2019-04-25 23:03:18 +03:00
andreykproductengine 580b35c8ea SL-307 Display in-viewer all warning messages logged by the mesh uploader 2019-04-01 20:22:25 +03:00
AndreyL ProductEngine 09b750483a SL-10293 Firestorm PR: preferences and menu search 2019-01-03 22:59:49 +02:00
andreykproductengine b7c909367e MAINT-7267 Fixed UI missing last symbol of string on hi-res monitors. 2017-04-06 21:29:43 +03:00
Mnikolenko Productengine eddcb43851 MAINT-7224 Chat logs move down, leaving huge empty space 2017-03-21 16:18:23 +02:00
andreykproductengine 8ef99c38a5 MAINT-918 Newline was not displayed correctly in chat window. 2017-01-04 18:38:52 +02:00
andreykproductengine da23e0f925 MAINT-6726 Fixed LLLineEditor menus staying in memory forever 2016-09-13 20:32:34 +03:00
andreykproductengine ff118b7d21 MAINT-6720 Fixed onVisibilityChange() crash in LLTextBase 2016-09-12 17:45:12 +03:00
andreykproductengine d37003a631 MAINT-2129 signuls cleanup 2016-05-23 18:06:16 +03:00
andreykproductengine efa716b5fc MAINT-2129 "Block" button doesn't become disabled 2016-05-18 19:29:31 +03:00
Oz Linden 950c41d184 merge 4.0.4-release and MAINT-5974 2016-05-06 10:28:42 -04:00
Oz Linden 31f3db0291 merge changes for DRTVWR-417 2016-03-16 13:08:06 -04:00
andreykproductengine 230fc28d8a MAINT-6097 FIXED On required update, clicking link to release notes opens browser behind menu 2016-03-11 20:16:03 +02:00
Oz Linden 5822fb00b6 merge DRTVWR-398 build cleanup fixes 2016-03-07 12:41:11 -05:00
andreykproductengine c73d9e5c44 MAINT-5984 FIXED Incorrect cursor position with UI scale >1.0 2015-12-29 20:20:40 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Oz Linden 69ff937e47 merge changes for 3.8.5-release 2015-10-13 08:43:03 -04:00
Mnikolenko ProductEngine 4ab4c6da02 MAINT-5463 FIXED Add hovertext to the official link badge in chat/IM, etc. 2015-08-10 11:15:50 +03:00
Oz Linden 71a468c6fb merge changes for other open sourc contributions 2015-07-30 11:09:00 -04:00
Mnikolenko ProductEngine 07020ffce0 MAINT-5428 FIXED Show tooltip for both parts of url. 2015-07-29 12:35:54 +03:00
AndreyL ProductEngine e62d5ea4e8 MAINT-5019 FIXED Undesired "http://" added to domains sent in chat
Completely removed matching of the URLs w/o a protocol
+ Some unit tests
2015-07-29 07:35:08 +03:00
Oz Linden 034fb74d05 merge changes for STORM-2113 2015-04-14 05:39:36 -04:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
Cinder 5a282abe18 STORM-2113 - uri parsing cleanup and fixes 2015-04-11 15:23:06 -06:00
Oz Linden d6f7a16a68 merge changes for 3.7.26-release 2015-03-23 22:39:18 -04:00
Oz Linden 905431cf60 merge changes for 3.7.25-release 2015-02-24 15:48:28 -05:00
andreykproductengine dbafa3c358 MAINT-4975 FIXED Sender's name is hidden out of view for inventory offer popups and payment popups 2015-03-11 15:56:31 +02:00
Mnikolenko ProductEngine f097c731d6 MAINT-4169 ShowGreyQueryInUrls debug setting was removed and the grey part of the link always appears. 2015-03-04 13:10:58 +02:00
Mnikolenko ProductEngine bf51454223 MAINT-4169 FIXED grey out all but domain name in SL-links, same as it's done for non-Linden URLs 2015-01-09 12:10:32 +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
andreykproductengine 389cba01c6 MAINT-3457 FIXED List of notecard content is shifted while resize of notecard window 2014-12-08 18:47:04 +02:00
maksymsproductengine 2b8827a55f MAINT-4169 FIXED Suppress initial display of the path portion of URLs from other users and scripts 2014-10-13 19:14:42 +03:00
maksymsproductengine 6ea75fd4b0 MAINT-4548 & MAINT-4557 FIXED build issues 2014-10-07 18:59:11 +03:00
maksymsproductengine a25748e11e MAINT-4119 FIXED Uniquely decorate links on Second Life or Linden Lab domains 2014-10-02 18:20:10 +03:00
maksymsproductengine dd8d2b59f7 MAINT-4170 FIXED Eliminate homoglyphs in URL hostnames: converting to lowercase links without scheme 2014-09-24 23:09:30 +03:00
maksymsproductengine 61e05f9125 MAINT-4170 Eliminate homoglyphs in URL hostnames: used 3p-uriparser; 2014-09-22 20:01:55 +03: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
Mnikolenko ProductEngine ae15e85e9f MAINT-3460 FIXED Dictionary doesn't exchange the mispelled word to correct one in a special case 2014-07-08 13:07:46 +03:00
simon bfa42c9e28 Merge downstream code and become 3.7.12 2014-07-07 16:17:53 -07:00
Cinder 8d2e0fb3a0 STORM-2035 - Invert the background color in script editors for highlighting sections. Since the background color can be changed by the user, this ensures distinctive highlighting 2014-06-20 13:43:31 -06:00
maksymsproductengine 7991fe96ec MAINT-3475 FIXED 'windows 64bit (?) crash in LLTextBase::getDocIndexFromLocalCoord' 2014-06-20 20:26:51 +03:00
simon d760a6889d Merge downstream code 2014-06-18 19:02:25 -07:00
Oz Linden e15002a11c merge changes for 3.7.9-release 2014-06-16 11:42:37 -04:00
maxim@mnikolenko 72dba8742c MAINT-4070 FIXED Use icon in urls when content is trusted. 2014-05-28 13:20:12 +03:00
maksymsproductengine 8b86130f25 MAINT-3967 FIXED Up arrow key does not move the cursor up in chat field. 2014-05-07 18:42:24 +03:00
Oz Linden a98b4b6bee merge changes for 3.7.7-release 2014-05-07 11:09:04 -04:00