Commit Graph

182 Commits (76876538715e3afbe456e2bf84173bde416d50e6)

Author SHA1 Message Date
Loren Shih 7687653871 Automated merge up from viewer-development 2010-10-20 12:18:33 -04:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Aimee Linden ffae589843 Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution 2010-09-03 17:41:39 +01:00
Aimee Linden 0a74d15935 Merge between james/viewer-identity-evolution and dessie/viewer-public 2010-09-03 15:30:16 +01:00
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
Richard Linden 9db7d6cb3d 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