summaryrefslogtreecommitdiff
path: root/indra/llui/lltextbase.cpp
AgeCommit message (Collapse)Author
2010-08-02Redo the same merge as in changeset "2026f824953f", but this time with ↵Christian Goetze (CG)
feeeeling.
2010-07-30Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1Kent Quirk
2010-07-27Backed out changeset: 58571b4e704bRichard Linden
2010-07-15Reverted changeset 2bb10eae42bfDessie Linden
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-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
2010-06-22EXT-7654 FIX "AddText" didn't create image segment now, use appendImageSegmentYuri Chebotarev
reviewed by Richard Nelson, Vadim Savchuk at https://codereview.productengine.com/secondlife/r/616/ --HG-- branch : product-engine
2010-06-18EXT-7766 FIX change the order of processing url matching and linebreaksYuri Chebotarev
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/596/ --HG-- branch : product-engine
2010-06-18EXT-6527 FIX Introduce new plain_text flag in LLTextBase and prevent image ↵Yuri Chebotarev
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-14EXT-7833 FIX [crashhunters] Crash in LLTextBase::reflow()Richard Nelson
2010-06-14EXT-7726 FIX didn't increase width if image segment didn't fit current lineYuri Chebotarev
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/557/ --HG-- branch : product-engine
2010-06-07Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-06-07EXT-7623 FIX One more place where text was processed into segments without ↵Yuri Chebotarev
LLLineBreakSegment. reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/516/ --HG-- branch : product-engine
2010-06-04DEV-50015 FIX Implement changes to the Buy L$ button in the top bar of the ↵Richard Nelson
viewer reviewed by Mani
2010-06-03merge from PE's viewer-trunkTofu Linden
2010-06-03EXT-6333 FIX introduce new segments - LLLineBreakSegment and LLImageSegmentYuri Chebotarev
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/241/ --HG-- branch : product-engine
2010-06-02fixed compile errorRichard Linden
2010-06-02eliminated several warnings on startupRichard Linden
2010-05-29EXT-7557 - About Second Life > Credits does not open with scrollbar all the ↵Richard Linden
way at the top also made floaters not update title label every time they are resized
2010-05-28MergeRichard Linden
2010-05-28Backed out changeset: 13b29333f1dbRichard Linden
2010-05-26EXT-7058 FIX Viewer freezes if IM chat floater with teleport offer is ↵Richard Nelson
resized a few times
2010-04-21Fixed normal bug EXT-6907 ('Show residents profile' menu opens inspector ↵Eugene Mutavchi
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-01mergeRichard Nelson
2010-04-01EXT-3531 - Ctrl-P does not work reliably on loginRichard Nelson
2010-03-23added some comments for fix to EXT-5549Richard Linden
2010-03-23fixed line ending style where I copied from araxis merge windowRichard Nelson
2010-03-23EXT-5549 Can't select last character in chat windowRichard Nelson
2010-03-24Manual merge from default branch.Vadim Savchuk
Resolved conflicts in llpanellandmarks.cpp. --HG-- branch : product-engine
2010-03-22fix for EXT-4288 Shrinking chat history window from top doesn't keep scroll ↵Yuri Chebotarev
thumb at bottom --HG-- branch : product-engine
2010-03-12merge for backout.Monroe Linden
2010-03-12Backed out changeset 6fdd352b80d6Monroe Linden
We thought this was a fix for EXT-6276, but it turned out it was just moving the problem.
2010-03-10mergeRichard Nelson
2010-03-10EXT-6295 - Cannot log in with new account, TOS dialog does not loadRichard Nelson
reviewed by Mani
2010-03-10Fix for EXT-6276.Monroe Linden
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-02-18Fix for EXT-5120 "Mouse-up in the scrollbar to the right of a link in nearby ↵Monroe Linden
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-08Tweak avatar name icon paddingJames Cook
2010-02-04Fix placement of icon next to linked agent/group names.James Cook
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-05Fix for EXT-4943 (Text editor is broken).Monroe Linden
Reviewed by Richard.
2010-02-03CID-405Tofu Linden
Checker: UNUSED_VALUE Function: LLNormalTextSegment::drawClippedSegment(int, int, int, int, LLRectBase<int>) File: /indra/llui/lltextbase.cpp
2010-02-02Further fixes for EXT-4689 (Long-word chat spam cripples fps and/or ↵Monroe Linden
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-02Fixed normal bug EXT-4740 - Object inspector hides however context menu presentDmitry Zaporozhan
--HG-- branch : product-engine
2010-02-01Fixes for EXT-4689 (Long-word chat spam cripples fps and/or disconnects client)Monroe Linden
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-01mergerichard
2010-02-01removed redundant coderichard
2010-02-01EXT-4848 - Crash when trying to view chicklet(?). Bug in word wrap logic.Eric M. Tulla (BigPapi)
Added a clamp to >= 0 for num pixels so we don't hit the assert. -Reviewed by Nyx
2010-02-01mergerichard