Commit Graph

118 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Yuri Chebotarev 75d3856811 EXT-7654 FIX "AddText" didn't create image segment now, use appendImageSegment
reviewed by Richard Nelson, Vadim Savchuk at https://codereview.productengine.com/secondlife/r/616/

--HG--
branch : product-engine
2010-06-22 15:50:34 +03:00
Yuri Chebotarev f26eb91c44 EXT-7766 FIX change the order of processing url matching and linebreaks
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/596/

--HG--
branch : product-engine
2010-06-18 10:49:09 +03:00
Yuri Chebotarev 884e08b509 EXT-6527 FIX Introduce new plain_text flag in LLTextBase and prevent image segment from being created if this flag is set.
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/587/

--HG--
branch : product-engine
2010-06-18 10:47:49 +03:00
Richard Nelson 380f472308 EXT-7833 FIX [crashhunters] Crash in LLTextBase::reflow() 2010-06-14 15:37:39 -07:00
Yuri Chebotarev 0904b13cbb EXT-7726 FIX didn't increase width if image segment didn't fit current line
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/557/

--HG--
branch : product-engine
2010-06-14 11:05:15 +03:00
Vadim Savchuk 3e80a0e025 Merge from default branch
--HG--
branch : product-engine
2010-06-07 14:07:45 +03:00
Yuri Chebotarev 6bbe55558f EXT-7623 FIX One more place where text was processed into segments without LLLineBreakSegment.
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/516/

--HG--
branch : product-engine
2010-06-07 12:56:29 +03:00
Richard Nelson 46e1253ee1 DEV-50015 FIX Implement changes to the Buy L$ button in the top bar of the viewer
reviewed by Mani
2010-06-04 14:25:51 -07:00
Tofu Linden 3fe3e119d8 merge from PE's viewer-trunk 2010-06-03 11:18:17 +01:00
Yuri Chebotarev 5c263cdc64 EXT-6333 FIX introduce new segments - LLLineBreakSegment and LLImageSegment
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/241/

--HG--
branch : product-engine
2010-06-03 10:38:03 +03:00
Richard Linden 6df66c35b3 fixed compile error 2010-06-02 14:43:45 -07:00
Richard Linden 9e7cf5c1bc eliminated several warnings on startup 2010-06-02 13:33:15 -07:00
Richard Linden 2646eb8166 EXT-7557 - About Second Life > Credits does not open with scrollbar all the way at the top
also made floaters not update title label every time they are resized
2010-05-29 13:31:37 -07:00
Richard Linden efdfc298d4 Merge 2010-05-28 16:55:58 -07:00
Richard Linden 2703125698 Backed out changeset: 13b29333f1db 2010-05-28 16:55:12 -07:00
Richard Nelson a01de4d25f EXT-7058 FIX Viewer freezes if IM chat floater with teleport offer is resized a few times 2010-05-26 10:10:20 -07:00
Eugene Mutavchi 647327d0ec Fixed normal bug EXT-6907 ('Show residents profile' menu opens inspector instead of profile) - added 'Url.ShowProfile' action.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/282/

--HG--
branch : product-engine
2010-04-21 20:23:55 +03:00
Richard Nelson 6cc65f9e5f merge 2010-04-01 12:52:04 -07:00
Richard Nelson 7b4046df83 EXT-3531 - Ctrl-P does not work reliably on login 2010-04-01 11:47:21 -07:00
Richard Linden e3e50bf7ed added some comments for fix to EXT-5549 2010-03-23 12:47:11 -07:00
Richard Nelson 07bc1f0ba5 fixed line ending style where I copied from araxis merge window 2010-03-23 11:22:46 -07:00
Richard Nelson 91b90b0a17 EXT-5549 Can't select last character in chat window 2010-03-23 11:18:01 -07:00
Vadim Savchuk d3a606f832 Manual merge from default branch.
Resolved conflicts in llpanellandmarks.cpp.

--HG--
branch : product-engine
2010-03-24 18:04:26 +02:00
Yuri Chebotarev 6efbbfa080 fix for EXT-4288 Shrinking chat history window from top doesn't keep scroll thumb at bottom
--HG--
branch : product-engine
2010-03-22 15:35:34 +02:00
Monroe Linden 070cb57ae1 merge for backout. 2010-03-12 12:14:52 -08:00
Monroe Linden 7ac2427b57 Backed out changeset 6fdd352b80d6
We thought this was a fix for EXT-6276, but it turned out it was just moving the problem.
2010-03-12 12:14:35 -08:00
Richard Nelson dcbf0ab31b merge 2010-03-10 18:22:26 -08:00
Richard Nelson 1e5fe95b1d EXT-6295 - Cannot log in with new account, TOS dialog does not load
reviewed by Mani
2010-03-10 18:20:18 -08:00
Monroe Linden 347585cf97 Fix for EXT-6276.
Added a check in LLTextBase::drawSelectionBackground() to keep it from sending degenerate rectangles to gl_rect_2d().  This seems to be what was causing the GL state to go bad.

Reviewed by Richard at http://codereview.lindenlab.com/534001
2010-03-10 14:32:40 -08:00
Monroe Linden ef9b7c5b36 Fix for EXT-5120 "Mouse-up in the scrollbar to the right of a link in nearby chat window opens the link".
Added an optional bool parameter "hit_past_end_of_line" to LLTextBase:: getDocIndexFromLocalCoord() and getSegmentAtLocalPos().  Default is true, which gives the old behavior.  If false, clicks past the end-of-line won't map to the last segment on the line.

Made LLNormalTextSegment::handleHover(), handleRightMouseDown(), handleMouseDown(), and handleMouseUp() call getSegmentAtLocalPos() in this new mode before processing URL actions, and only do the processing if it returns the same segment.

Reviewed by Richard.
2010-02-18 15:45:31 -08:00
James Cook e0f6dc33ab Tweak avatar name icon padding 2010-02-08 09:11:27 -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