Commit Graph

225 Commits (22a851663cddecced21acd88ed8ae4fa9fc733fd)

Author SHA1 Message Date
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Richard Linden 9db7d6cb3d fix for sim console not staying scrolled to bottom 2010-08-24 09:41:35 -07:00
Richard Linden 5a6a792920 fix for sim console not staying scrolled to bottom 2010-08-24 09:41:35 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Andrew Dyukov 55c887225f EXT-8010 ADDITIONAL FIX Fixed problems with avatar links underlining.
There were two problems:

1. Underlining broke when avatar's first and second name were on different lines.
2. There was no underline on hover for avatar miniinspector links in plaintext IM.

- First problem was caused by calling LLOnHoverChangeableTextSegment::draw() for the same segment twice- for first and second name that were
on different lines, while handleHover() was called only once. So handleHover() was called -> text was underlined -> first part of segment was
drawn underlined -> its draw set style back to normal -> second part of segment was drawn without underlining.

Fixed this by setting style back to normal only when drawing the last part of the segment.

- Second problem was caused by unusual way of appending link to text in chat history.

Changed it so that LLTextBase::appendText() now receives link not inside style params, but directly.
Also added "/inspect" ending to check in LLUrlEntryAgent::underlineOnHoverOnly().

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/833/

--HG--
branch : product-engine
2010-08-09 15:14:45 +03:00
Leyla Farazha 6f256e2d57 Merge with dessie/viewer-release 2010-08-04 15:44:45 -07:00
Christian Goetze (CG) 6a1fefac22 Redo the same merge as in changeset "2026f824953f", but this time with feeeeling. 2010-08-02 16:59:20 -07:00
Richard Nelson d72a21aca1 further UI rendering performance improvements 2010-07-30 15:17:32 -07:00
Kent Quirk 19c0d6d4ea Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1 2010-07-30 10:11:55 -04:00
Andrew Dyukov b934743014 EXT-8010 ADDITIONAL FIX Fixed problems with avatar links underlining.
There were two problems:

1. Underlining broke when avatar's first and second name were on different lines.
2. There was no underline on hover for avatar miniinspector links in plaintext IM.

- First problem was caused by calling LLOnHoverChangeableTextSegment::draw() for the same segment twice- for first and second name that were
on different lines, while handleHover() was called only once. So handleHover() was called -> text was underlined -> first part of segment was
drawn underlined -> its draw set style back to normal -> second part of segment was drawn without underlining.

Fixed this by setting style back to normal only when drawing the last part of the segment.

- Second problem was caused by unusual way of appending link to text in chat history.

Changed it so that LLTextBase::appendText() now receives link not inside style params, but directly.
Also added "/inspect" ending to check in LLUrlEntryAgent::underlineOnHoverOnly().

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/833/

--HG--
branch : product-engine
2010-08-09 15:14:45 +03:00
Richard Nelson b95ad3b5ce further UI rendering performance improvements 2010-07-30 15:17:32 -07:00
Richard Linden b5a94da19b fix for vertical truncation of sidebar headers 2010-07-29 11:56:19 -07:00
Richard Linden e69f0f8a02 fix for vertical truncation of sidebar headers 2010-07-29 11:56:19 -07:00
Richard Linden 15247f0869 Backed out changeset: 58571b4e704b 2010-07-27 14:22:14 -07:00
Leyla Farazha 0e06dc8964 Merge from dessie/viewer-release 2010-07-27 14:13:07 -07:00
Richard Linden b4dfa76c9d merge 2010-07-27 10:30:17 -07:00
Richard Linden 0f2f597e7a merge 2010-07-27 10:30:17 -07:00
Andrew Dyukov 4919f0b341 EXT-8010 FIXED Implemented special behaviour of avatar links.
Avatar links are now underlined only on hover. Also they have the same color as other links.

- Underlining text and getting it back to normal are done in handleHover() and draw() of new LLOnHoverChangeableTextSegment
class derived from LLNormalTextSegment. This class has two pointers to styles- one for style which will be used for text
on hover, and another otherwise. This special type of text segment is used if link's boolean member mUnderlineOnHoverOnly
is true. So it is URL's flag depending on which textbase adds new text segment(like it currently happens with mDisabledLink).

- Changed avatar link color in colors.xml to emphasis (because it was white before and was inconsistent with other links).

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/749/

--HG--
branch : product-engine
2010-07-26 18:10:29 +03:00
Andrew Dyukov 0c8cddecc1 EXT-8010 FIXED Implemented special behaviour of avatar links.
Avatar links are now underlined only on hover. Also they have the same color as other links.

- Underlining text and getting it back to normal are done in handleHover() and draw() of new LLOnHoverChangeableTextSegment
class derived from LLNormalTextSegment. This class has two pointers to styles- one for style which will be used for text
on hover, and another otherwise. This special type of text segment is used if link's boolean member mUnderlineOnHoverOnly
is true. So it is URL's flag depending on which textbase adds new text segment(like it currently happens with mDisabledLink).

- Changed avatar link color in colors.xml to emphasis (because it was white before and was inconsistent with other links).

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/749/

--HG--
branch : product-engine
2010-07-26 18:10:29 +03:00
Richard Linden 50d8cc6d37 first pass ui rendering performance improvements 2010-07-23 22:07:15 -07:00
Richard Linden 6cc6f81678 first pass ui rendering performance improvements 2010-07-23 22:07:15 -07:00
Richard Nelson fde4edf75d merge 2010-07-20 11:31:23 -07:00
Richard Nelson 572e72d8a1 merge 2010-07-20 11:31:23 -07:00
Leyla Farazha 99176071bf Merge from q/viewer-release just picking up 13634 (39cb633321ed) for the creator icon fix 2010-07-20 11:30:21 -07:00
Leyla Farazha d603085c03 Merge with dessie/viewer-release 2010-07-19 17:22:12 -07:00
Richard Linden b36abda510 merge 2010-07-16 17:13:17 -07:00
Richard Linden b73ef2f338 merge 2010-07-16 17:13:17 -07:00
Richard Linden 5eaab96a0b EXT-8465 FIX Text selection is often unreadable 2010-07-16 17:11:51 -07:00
Richard Linden 109ff259ca EXT-8465 FIX Text selection is often unreadable 2010-07-16 17:11:51 -07:00
Monroe Linden 551f74125b Changes to allow disabling an LLTextBox (or LLTextBox subclass) to gray out the text.
Due to some legacy issues, text boxes will not gray out on disable unless they have their text_readonly_color property in xui set to "LabelDisabledColor" (or some other color distinct from their text color).

Reviewed by Richard.
2010-07-15 16:32:50 -07:00
Monroe Linden 6ad6f91163 Changes to allow disabling an LLTextBox (or LLTextBox subclass) to gray out the text.
Due to some legacy issues, text boxes will not gray out on disable unless they have their text_readonly_color property in xui set to "LabelDisabledColor" (or some other color distinct from their text color).

Reviewed by Richard.
2010-07-15 16:32:50 -07:00
Dessie Linden 5d85dad85f Reverted changeset 2bb10eae42bf 2010-07-15 12:31:08 -07:00
Richard Linden 2c722547ea changed allow_html to parse_urls to be clearer about its meaning
allow_html still supported as alternate
2010-07-15 10:20:06 -07:00
Richard Linden 2fb2efe2a2 changed allow_html to parse_urls to be clearer about its meaning
allow_html still supported as alternate
2010-07-15 10:20:06 -07:00
Richard Linden 1d1377079b EXT-8300 FIX Creator's icon overlaps description text on object's mini-inspector
reviewed by Leyla
2010-07-14 11:48:33 -07:00
Richard Linden 1f79bee86e EXT-8237 FIX Opening up Edit Outfit- Add More->Shirt causes FPS to drop from 60fps to 18fps for a really long time
EXT-8235 FIX HUGE long delay when reopening and/or closing edit outfit sidepanel if "Add More..." is active
EXT-7695 FIX UI lockup after add wearable, right click av -> Change Outfit

reviewed by Vir
2010-07-09 14:26:56 -07:00
Leyla Farazha 5546f78fff fixing windows line endings 2010-07-06 17:55:12 -07:00
Leyla Farazha 33d1aa30ab Merge from dessie/viewer-release 2010-07-06 17:51:07 -07:00
Yuri Chebotarev 04838e411b merge
--HG--
branch : product-engine
2010-07-02 15:27:08 +03:00
Yuri Chebotarev 0cf9168895 EXT-5692 FIX Add callback to create widget segment with LLAvatarIconCtrl (or LLGroupIconCtrl) based on url match id.
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/610/

--HG--
branch : product-engine
2010-07-02 15:23:05 +03:00
Richard Linden 187a4b638d EXT-7654 - About Land Floater> Icons missing
fixed layout of embedded icons in text labels
2010-07-01 19:48:39 -07:00
Leyla Farazha 86ba458ebc merge fix 2010-06-21 15:04:12 -07:00
Leyla Farazha c897061856 Merge with q/viewer-release 2010-06-21 10:21:52 -07: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
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
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
Richard Linden fbf7279016 merge fixes 2010-06-03 14:37:02 -07:00
Richard Linden f79ac664dd merge 2010-06-03 14:15:11 -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 7435ff08b5 DEV-50271 FIX SLURL support for non-clickable display names
separate mIsLink from mLink to support non-clickable urls (e.g. secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/completename)
2010-05-26 13:14:47 -07:00
James Cook 0ebdba45f6 Merge with dessie/viewer-public to get Callum's webkit changes 2010-05-26 10:53:59 -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
Richard Nelson f682c996d2 DEV-50271 FIX SLURL support for non-clickable display names 2010-05-24 18:29:29 -07:00
Richard Nelson 4ea7d2de9f DEV-50271 FIX SLURL support for non-clickable display names
reviewed by James
2010-05-24 17:25:35 -07:00
James Cook 2b7153c26a merge from dessie/viewer-public right before SLE code landed 2010-05-11 16:11:09 -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
James Cook ecc2c72650 Merge latest viewer-hotfix, approximately equal to Viewer 2.0 final 2010-03-29 16:55:22 -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
James Cook f0d3ea53cd Merge latest from viewer-hotfix, including fix for TOS screen 2010-03-10 20:32:56 -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
James Cook 60799effae Merge 2010-03-10 15:46:45 -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 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
James Cook fe8d015851 Merge 2010-03-02 14:06:23 -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 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