summaryrefslogtreecommitdiff
path: root/indra/llui/lltextbase.cpp
AgeCommit message (Collapse)Author
2010-10-21Automated merge up from viewer-developmentLoren Shih
2010-10-20Automated merge up from viewer-developmentLoren Shih
2010-10-19STORM-390 FIXED "Place Profile" appeared instead of "Resident Profile" after ↵Vadim ProductEngine
clicking on user name in a nearby chat toast. Now clicking an avatar name opens avatar profile; clicking an object name opens object inspector. This change rolls back the fix of STORM-358.
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03Merge between james/viewer-identity-evolution and dessie/viewer-publicAimee Linden
2010-08-25mergeTofu Linden
2010-08-25EXT-8398/EXT-8300 FIXED Avatar icons displaced from SLURL profile linksAimee Linden
Icon was being inserted before any text preceding the link. Reviewed by Richard.
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-24fix for sim console not staying scrolled to bottomRichard Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-09EXT-8010 ADDITIONAL FIX Fixed problems with avatar links underlining.Andrew Dyukov
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-04Merge with dessie/viewer-releaseLeyla Farazha
2010-08-02Redo the same merge as in changeset "2026f824953f", but this time with ↵Christian Goetze (CG)
feeeeling.
2010-07-30further UI rendering performance improvementsRichard Nelson
2010-07-30Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1Kent Quirk
2010-08-09EXT-8010 ADDITIONAL FIX Fixed problems with avatar links underlining.Andrew Dyukov
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-07-30further UI rendering performance improvementsRichard Nelson
2010-07-29fix for vertical truncation of sidebar headersRichard Linden
2010-07-29fix for vertical truncation of sidebar headersRichard Linden
2010-07-27Backed out changeset: 58571b4e704bRichard Linden
2010-07-27Merge from dessie/viewer-releaseLeyla Farazha
2010-07-27mergeRichard Linden
2010-07-27mergeRichard Linden
2010-07-26EXT-8010 FIXED Implemented special behaviour of avatar links.Andrew Dyukov
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-26EXT-8010 FIXED Implemented special behaviour of avatar links.Andrew Dyukov
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-23first pass ui rendering performance improvementsRichard Linden
2010-07-23first pass ui rendering performance improvementsRichard Linden
2010-07-20mergeRichard Nelson
2010-07-20mergeRichard Nelson
2010-07-20Merge from q/viewer-release just picking up 13634 (39cb633321ed) for the ↵Leyla Farazha
creator icon fix
2010-07-19Merge with dessie/viewer-releaseLeyla Farazha
2010-07-16mergeRichard Linden
2010-07-16mergeRichard Linden
2010-07-16EXT-8465 FIX Text selection is often unreadableRichard Linden
2010-07-16EXT-8465 FIX Text selection is often unreadableRichard Linden
2010-07-15Changes to allow disabling an LLTextBox (or LLTextBox subclass) to gray out ↵Monroe Linden
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-15Changes to allow disabling an LLTextBox (or LLTextBox subclass) to gray out ↵Monroe Linden
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-15Reverted changeset 2bb10eae42bfDessie Linden
2010-07-15changed allow_html to parse_urls to be clearer about its meaningRichard Linden
allow_html still supported as alternate
2010-07-15changed allow_html to parse_urls to be clearer about its meaningRichard Linden
allow_html still supported as alternate
2010-07-14EXT-8300 FIX Creator's icon overlaps description text on object's mini-inspectorRichard Linden
reviewed by Leyla
2010-07-09EXT-8237 FIX Opening up Edit Outfit- Add More->Shirt causes FPS to drop from ↵Richard Linden
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-06fixing windows line endingsLeyla Farazha
2010-07-06Merge from dessie/viewer-releaseLeyla Farazha
2010-07-02mergeYuri Chebotarev
--HG-- branch : product-engine
2010-07-02EXT-5692 FIX Add callback to create widget segment with LLAvatarIconCtrl (or ↵Yuri Chebotarev
LLGroupIconCtrl) based on url match id. reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/610/ --HG-- branch : product-engine
2010-07-01EXT-7654 - About Land Floater> Icons missingRichard Linden
fixed layout of embedded icons in text labels