Tofu Linden
1d89a80ba7
merge
2010-08-25 15:58:08 +01:00
Aimee Linden
97b3314200
EXT-8398/EXT-8300 FIXED Avatar icons displaced from SLURL profile links
...
Icon was being inserted before any text preceding the link.
Reviewed by Richard.
2010-08-25 01:19:44 +01:00
Tofu Linden
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
Tofu Linden
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01: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
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
Richard Linden
b5a94da19b
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
Richard Linden
b4dfa76c9d
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
Richard Linden
50d8cc6d37
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 Linden
b36abda510
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
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
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
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
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
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