summaryrefslogtreecommitdiff
path: root/indra/llui/llurlentry.cpp
AgeCommit message (Collapse)Author
2010-11-08pull beta changes back to developmentOz Linden
2010-11-05SEC-784Kent Quirk
2010-10-28STORM-489 FIXED <nolink>'ed text rendered as URLVadim ProductEngine
Changes: * Suppressed URLs in object (sender) names of nearby chat messages loaded from history. * Fixed text between <nolink>...</nolink> text being rendered as URL (hand cursor on hover, context menu, context menu, opening Places SP on click).
2010-10-22STORM-297 FIXED Fixed "<nolink>" text appearing in confirmation message if ↵Vadim ProductEngine
there is "<" symbol in Landmarks name. Modified the "<nolink>...</nolink>" clause parsing regexp to allow "<" in the middle.
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-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-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-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-06Merge from dessie/viewer-releaseLeyla Farazha
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-05-26DEV-50271 FIX SLURL support for non-clickable display namesRichard Nelson
std::multimap::find does *not* return an iterator just to the matching results, use std::multimap::equal_range instead
2010-05-26DEV-50271 FIX SLURL support for non-clickable display namesRichard Nelson
separate mIsLink from mLink to support non-clickable urls (e.g. secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/completename)
2010-05-25DEV-50271 FIX SLURL support for non-clickable display namesRichard Linden
revived mDisabledLink to make url replacement logic work again
2010-05-25MergeJames Cook
2010-05-25DEV-50013 WIP gCacheName->getGroup() to distinguish from av lookupsJames Cook
Helps with global finds looking for remaining calls to patch. Reviewed with Leyla.
2010-05-24DEV-50271 FIX SLURL support for non-clickable display namesRichard Nelson
2010-05-24DEV-50271 FIX SLURL support for non-clickable display namesRichard Nelson
reviewed by James
2010-05-20DEV-50013 Tooltip for SLAPP agent inspect linksJames Cook
Reviewed with Erica (language) / Leyla (code)
2010-05-18Rename mSLID to mUsername to match the name of the field in the UIJames Cook
Product made a late-breaking request to change the name of this field. The wire protocol for People API has not yet changed.
2010-05-13merge pull from dessie/viewer-public, picking up SLE codeJames Cook
2010-05-11Clean up merge-fight about getIcon() const-nessJames Cook
2010-05-11merge from dessie/viewer-public right before SLE code landedJames Cook
2010-05-04Automated mergeRoxie Linden
2010-04-29DEV-49489 Display name support in URL-style name widgets, alsoJames Cook
Fixed problem where labels like "Mute John Smith" were not being applied when the name was not in cache.
2010-04-28Remove prototype support for badges next to avatar namesJames Cook
Easy to reimplement if we decide we want to do it.
2010-04-23Related to normal bug EXT-6302 (TP requests need to display destination ↵Eugene Mutavchi
region maturity) - added displaying maturity rating with an icon. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/229/. --HG-- branch : product-engine
2010-04-07Automated mergeRoxie Linden
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-07PE merge from pe-viewer-trunkTofu Linden
2010-04-07mergeTofu Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-04-02Fixed normal bug EXT-6348 (SLapp world map location does not display the ↵Eugene Mutavchi
correct region) - fixed displaying the world map location for escaped SLapp urls. Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/173/. --HG-- branch : product-engine
2010-04-02Manual merge from default branch.Vadim Savchuk
Resolved a conflict in indra/llui/llurlentry.cpp. That broke the fix for EXT-6357. --HG-- branch : product-engine
2010-04-02PE mergeTofu Linden
2010-04-02Fixed normal bug EXT-6357 (SLapp for object chat does display an inspector) ↵Eugene Mutavchi
- added new LLUrlEntry to support 'secondlife:///app/objectim/{UUID}/' SLapps. Fixed passing the SLURL to inspect_remote_object floater. Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/158/ --HG-- branch : product-engine
2010-03-29Merge latest viewer-hotfix, approximately equal to Viewer 2.0 finalJames Cook
2010-03-22Weekly automated merge from viewer 2.0Roxie Linden
2010-03-17EXT-6335: Add custom labels for specific agent SLapp commands.Lynx Linden
We now display custom labels and tooltips for the various secondlife:///app/agent SLapp suffixes that we support. These include: /mute, /unmute, /pay, /im, /offerteleport, and /requestfriend. For example, entering: secondlife:///app/agent/3e2d81e8-6269-8100-860e-c64e5cee3c2c/mute Now displays the SLapp in text chat as "Mute <Name>", rather than simply "<Name>".
2010-03-08automated mergeRoxie Linden
2010-03-08Merge with viewer 2 beta 4James Cook
2010-03-03Underlined display names now update reliably.James Cook
2010-03-03Additional commit for EXT-4574 ([BSI] Unhelpful tooltip for Partner and ↵Vadim Savchuk
Group links in Profile). Fixed tooltip for agent SLURLs. --HG-- branch : product-engine
2010-03-03Fixed bug EXT-4574 ([BSI] Unhelpful tooltip for Partner and Group links in ↵Vadim Savchuk
Profile). For wiki-style links ([<URL> <label>]) we now show the tooltip corresponding to the URL type. --HG-- branch : product-engine
2010-03-02MergeJames Cook
2010-02-22Fixed normal bug EXT-4964 (Invalid SLURL detection does not detect invalid ↵Andrew Dyukov
slurls). - Added new static method LLSLURL::isValidSLURL() whic uses LLUrlRegistry::isUrl() to validate SLURLs and not just chek prefixes as LLSLURL::isSLURL() does. - Used it in slurl DnD check in LLViewerWindow. - LLUrlEntrySLURL regexp was changed not to pass non-valid SLURLS (such as one from the bug description). --HG-- branch : product-engine
2010-02-18Preference to set what fields name tags display, andJames Cook
first attempt at "use display names" menu item which doesn't work yet