Commit Graph

91 Commits (c16591c046fa76fc5d13387efa3bcaec3422e593)

Author SHA1 Message Date
James Cook c16591c046 Per-avatar customizable icons next to name links in text
Changed LLUrlEntryAgent callbacks to handle both link label and icon
Eliminated legacy LLNameCache file loading
Reviewed with Kelly
2010-02-12 16:12:12 -08:00
James Cook 9dd7924b19 Merge 2010-02-11 10:09:23 -08:00
James Cook e0f6dc33ab Tweak avatar name icon padding 2010-02-08 09:11:27 -08:00
James Cook 33e613531f Fix placement of icon next to linked agent/group names.
Suppresses rendering of text in LLNormalTextSegment that represent an icon,
properly computes vertical spacing based on font height, and adds padding
to the right of the icon.
2010-02-04 22:19:15 -08:00
James Cook 92ac993287 Fix placement of icon next to linked agent/group names.
Suppresses rendering of text in LLNormalTextSegment that represent an icon,
properly computes vertical spacing based on font height, and adds padding
to the right of the icon.
(transplanted from 33be702e47c359ccaeb47f251e10753fd173cc09)
2010-02-04 22:19:15 -08:00
Monroe Linden 68ea862c96 Fix for EXT-4943 (Text editor is broken).
Reviewed by Richard.
2010-02-05 15:51:49 -08:00
Tofu Linden bf18e798c5 CID-405
Checker: UNUSED_VALUE
Function: LLNormalTextSegment::drawClippedSegment(int, int, int, int, LLRectBase<int>)
File: /indra/llui/lltextbase.cpp
2010-02-03 21:13:37 +00:00
Monroe Linden 5491dd6e98 Further fixes for EXT-4689 (Long-word chat spam cripples fps and/or disconnects client).
This should fix the inefficiencies in the append path that made viewer FPS drop severely when addinglarge amounts of text to the nearby chat floater.

Resizing the floater with a huge amount of text in it is still pretty bad, but fixing that will require some bigger architectural changes.

Changed LLTextBase::needsReflow() to take an offset at which to start reflow processing.

Changed most needsReflow() calls in LLTextBase to supply a proper index.

Changed LLTextBase::reflow() to use the reflow index maintained by needsReflow().

Removed all needsReflow() calls from LLTextEditor (the only way for it to manipulate the text is through functions in LLTextBase that already manage reflowing internally).

Removed LLTextEditor::replaceUrlLabel(), since it was identical to the inherited version LLTextBase::replaceUrlLabel().

Reviewed by Richard.
2010-02-02 18:24:11 -08:00
Dmitry Zaporozhan 38315a063d Fixed normal bug EXT-4740 - Object inspector hides however context menu present
--HG--
branch : product-engine
2010-02-02 14:25:31 +02:00
Monroe Linden 4ad357ec70 Fixes for EXT-4689 (Long-word chat spam cripples fps and/or disconnects client)
Removed some unnecessary string copies in LLTextBase and LLNormalTextSegment by changing getWText() to return const LLWString& (instead of LLWString), and storing the result in a const LLWString& instead of an LLWString in places where the string doesn't need to be modified.

Made LLTextViewModel::getDisplay() also return const LLWString& instead of LLWString.

Removed a couple of unused local string variables in LLTextBase (the compiler flagged these after converting the local copies to const LLWString&).
2010-02-01 17:51:30 -08:00
richard 08adb4cfed merge 2010-02-01 13:50:35 -08:00
richard 8dbb2c6fd1 removed redundant code 2010-02-01 13:50:15 -08:00
Eric M. Tulla (BigPapi) ec5ad98abe EXT-4848 - Crash when trying to view chicklet(?). Bug in word wrap logic.
Added a clamp to >= 0 for num pixels so we don't hit the assert.
-Reviewed by Nyx
2010-02-01 15:47:16 -05:00
richard 45e700cb3e merge 2010-02-01 12:39:59 -08:00
Lynx Linden 2ec69d6d71 EXT-4678: Revert URL black list support from LLTextBase.
The new <nolink>URL</nolink> provides a more flexible solution that
can be specified in XUI (as we now do to disabled hyperlinking for the
sim hostname in the About floater).
2010-01-29 14:56:39 +00:00
Lynx Linden 4d6c9e3e17 EXT-4678: Support <nolink>...</nolink> to turn off URL hyperlinking.
We are running into a bunch of places where we don't want to allow
hyperlinking of URLs like secondlife.com in text boxes. I've therefore
added a new type of URL regex that disables URL hyperlinking. Simply
enclose the URL in a <nolink> tag, e.g.:

  <nolink>secondlife.com</nolink>
2010-01-29 14:30:26 +00:00
Tofu Linden 3d771ed88b PE merge. 2010-01-26 10:36:27 -08:00
Dmitry Zaporozhan e8b4a14b1d Fixed major bug EXT-4719 - Crash in LLTextBase after showing popup menu for link.
--HG--
branch : product-engine
2010-01-26 17:07:12 +02:00
Lynx Linden 0a38adfd8a EXT-4678: Don't hyperlink sim URLs in About window.
Added support for specifying a black list of URLs on a per-widget
basis. URLs on this black list will not be hyperlinked in the text
widget. The About dialog adds the sim hostname to this black list.
2010-01-26 13:09:26 +00:00
angela a358dc65c4 Automated merge with ssh://angela@hg.lindenlab.com/james/gooey 2010-01-26 08:00:29 +08:00
angela 66e7c2ce77 fix mac build failure -- richard 2010-01-26 06:48:42 +08:00
Tofu Linden 9f44c4df79 Fix some Linux build breakage - can't treat the return of a constructor call as a ref with gcc, have to use intermediate variable. 2010-01-25 10:30:57 -08:00
Denis Serdjuk 410e105f52 fixed bug EXT-4433 [BSI] friend privacy settings greyed out
EXT-4353, EXT-4587, EXT-4442 have same cause.  it should fix they.

--HG--
branch : product-engine
2010-01-25 15:15:06 +02:00
richard 337716d946 LLPointer cleanup and fix for EXT-4413
reviewed by Rick
2010-01-22 16:51:13 -08:00
richard cf2beaeea6 EXT-4380 - LLTextEditor: line_spacing.multiple option doesn't work well with "widgeted" text
partial fix

reviewed by Leyla
2010-01-15 13:16:58 -08:00
richard 4966073030 moved clipping logic inside LLFontGL::maxDrawableChars controlled by EWordWrapStyle
fixes regression introduced in 3eef5ce9ae1e6fc62b9b52ce859501dd4e70fadf

reviewed by Brad
2010-01-06 12:23:56 -08:00
Tofu Linden 183c991402 DEV-44614 ugly/broken font and formatting used for IM toast emotes
fix bug, also fix some comments/typos/enumparams in this code area.
2009-12-23 11:29:13 -08:00
richard 2b22831dd0 ext-3307 - nearby chat stays scrolled at bottom 2009-12-18 15:18:16 -08:00
richard 49a037048c oops, forgot to remove assert 2009-12-17 11:44:37 -08:00
richard 9abe9bf5df clamp instead of assert when running out of room during reflow 2009-12-17 11:44:01 -08:00
richard f452c01915 EXT-3087 - Crash when avatar icon truncated in interactive notifications
reviewed by Mani
2009-12-17 09:54:44 -08:00
richard 19d9cf8d8e ext-3404 - script editor scrolls to the bottom and sticks 2009-12-11 16:48:05 -08:00
richard 9ad76199e5 fixed a regression that caused bottom 15 pixels of scrollable text editors to appear blank 2009-12-11 16:25:38 -08:00
richard c6234f352a variable renames in LLTextBase 2009-12-11 14:34:30 -08:00
richard b8fdf82510 fix for ellipses not appearing in single line text widgets
fix for ellipses sometimes appearing at end of wrapped line of text

reviewed by James
2009-12-11 13:50:40 -08:00
richard 7a05356749 EXT-2572 - Bottom text on bottom line in nearby chat is clipped 2009-12-08 18:43:32 -08:00
richard 08233e283d added fading back to icons in text widgets 2009-12-08 14:34:44 -08:00
richard 9aa12417cb ext-3087 - avatar icon is truncated badly
reviewed by James
2009-12-08 14:08:58 -08:00
richard fdf8602d5f fix for inline widgets never shrinking with resizable text editor
also fixed dropping last line in chat history
2009-12-07 19:03:31 -08:00
richard 3cf11892e4 fix for horizontal scrolling in text_editors 2009-12-07 15:34:19 -08:00
richard 1d2a8e0f83 ext-3112 - bad font width information with sansserif 2009-12-07 13:00:40 -08:00
James Cook 2fe5e55f4f Hack for EXT-2971 Letter R doesn't show when it's the last letter in a text block.
Add 1 pixel of padding to clipping rect computation.  I think there is a deeper
problem in the font width computation code, but I don't know where.  Opened EXT-3112
for the deeper issue.  Reviewed with Leyla.
2009-12-03 15:20:21 -08:00
James Cook 6c2101a44e EXT-2984 Fixed crash in LLNormalTextSegment::getDimensions (no repro)
Avoid stepping off end of array when text segment has 0 characters
Reviewed with Ambroff
2009-12-03 09:32:05 -08:00
James Cook d5d1db8833 EXT-3015 Fixed right and center aligned text boxes
Document rect left edge was being computed incorrectly.
Made floater_test_textbox.xml have more examples of text.
Reviewed with Kelly
2009-12-01 11:29:33 -08:00
richard 9d52d15db8 fix for ellipses on a single line 2009-11-25 20:11:04 -08:00
richard 4885ddab8d EXT-1944 - Implement ellipsis in message well
EXT-699 - Toasts should display maximum 6 lines of text before ellipses are applied
EXT-2453 - TextBox displays an extra line of text
2009-11-25 19:55:24 -08:00
richard edcd835feb fixed line numbering in script editors 2009-11-25 19:14:55 -08:00
richard 617ca79ed0 forgot to apply resize fix for when text is selected
EXT-1995 - [BSI] Get rid of the *blop* sound when a textbox contains more text than displayable
2009-11-25 18:55:15 -08:00
richard cdb2232284 created container for LLFloaterView for future z-swapping with sidetray
floaters can now overlap sidetray
fixed text selection background color to be inverse of text fg color
EXT-2713 	Script editor automatically scrolls to the top of script text when text is longer than the window.

reviewed by James
2009-11-25 18:24:39 -08:00
Steve Bennetts 9e2d78aca1 Merge from product-engine 2009-11-24 12:42:14 -08:00