Commit Graph

87 Commits (76876538715e3afbe456e2bf84173bde416d50e6)

Author SHA1 Message Date
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 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
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
Leyla Farazha 33d1aa30ab Merge from dessie/viewer-release 2010-07-06 17:51:07 -07: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 Nelson 0f86f811c2 DEV-50271 FIX SLURL support for non-clickable display names
std::multimap::find does *not* return an iterator just to the matching results, use std::multimap::equal_range instead
2010-05-26 14:47:48 -07:00
Richard Nelson 7435ff08b5 DEV-50271 FIX SLURL support for non-clickable display names
separate mIsLink from mLink to support non-clickable urls (e.g. secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/completename)
2010-05-26 13:14:47 -07:00
Richard Linden d539145367 DEV-50271 FIX SLURL support for non-clickable display names
revived mDisabledLink to make url replacement logic work again
2010-05-25 18:52:24 -07:00
James Cook a91d10dc18 Merge 2010-05-25 11:41:33 -07:00
James Cook 77e6fcd423 DEV-50013 WIP gCacheName->getGroup() to distinguish from av lookups
Helps with global finds looking for remaining calls to patch.
Reviewed with Leyla.
2010-05-25 11:39:06 -07:00
Richard Nelson f682c996d2 DEV-50271 FIX SLURL support for non-clickable display names 2010-05-24 18:29:29 -07:00
Richard Nelson 4ea7d2de9f DEV-50271 FIX SLURL support for non-clickable display names
reviewed by James
2010-05-24 17:25:35 -07:00
James Cook 0df5c0e879 DEV-50013 Tooltip for SLAPP agent inspect links
Reviewed with Erica (language) / Leyla (code)
2010-05-20 14:15:27 -07:00
James Cook f4148502e4 Rename mSLID to mUsername to match the name of the field in the UI
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-18 16:00:45 -07:00
James Cook 8b52454990 merge pull from dessie/viewer-public, picking up SLE code 2010-05-13 15:47:32 -07:00
James Cook 31a0d236d5 Clean up merge-fight about getIcon() const-ness 2010-05-11 17:26:29 -07:00
James Cook 2b7153c26a merge from dessie/viewer-public right before SLE code landed 2010-05-11 16:11:09 -07:00
Roxie Linden a11ec0c89f Automated merge 2010-05-04 16:09:14 -07:00
James Cook 781c76e85c DEV-49489 Display name support in URL-style name widgets, also
Fixed problem where labels like "Mute John Smith" were not being applied
when the name was not in cache.
2010-04-29 12:34:22 -07:00
James Cook 8fae11ee36 Remove prototype support for badges next to avatar names
Easy to reimplement if we decide we want to do it.
2010-04-28 17:02:50 -07:00
Eugene Mutavchi d0204a2b14 Related to normal bug EXT-6302 (TP requests need to display destination 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-23 21:52:18 +03:00
Roxie Linden 8ba5517a08 Automated merge 2010-04-07 13:20:33 -07:00
Roxie Linden 658ccc3e85 Re-insert backed out SLE checkin so we can fix it 2010-04-07 11:08:04 -07:00
Tofu Linden adce2ecdf8 PE merge from pe-viewer-trunk 2010-04-07 13:03:35 +01:00
Tofu Linden 8da371b0f0 merge 2010-04-07 12:16:36 +01:00
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
Eugene Mutavchi cf94709c60 Fixed normal bug EXT-6348 (SLapp world map location does not display the 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-02 19:53:19 +03:00
Vadim Savchuk 7d38dd51c2 Manual merge from default branch.
Resolved a conflict in indra/llui/llurlentry.cpp. That broke the fix for EXT-6357.

--HG--
branch : product-engine
2010-04-02 17:18:36 +03:00
Tofu Linden e46f128d20 PE merge 2010-04-02 12:35:24 +01:00
Eugene Mutavchi 32283a93e0 Fixed normal bug EXT-6357 (SLapp for object chat does display an inspector) - 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-04-02 13:36:58 +03:00
James Cook ecc2c72650 Merge latest viewer-hotfix, approximately equal to Viewer 2.0 final 2010-03-29 16:55:22 -07:00
Roxie Linden 18b7ab0018 Weekly automated merge from viewer 2.0 2010-03-22 16:12:41 -07:00
Lynx Linden 509457b8ef EXT-6335: Add custom labels for specific agent SLapp commands.
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-17 15:13:08 +00:00
Roxie Linden 20379fecd9 automated merge 2010-03-08 21:39:38 -08:00
James Cook 18ebacefcf Merge with viewer 2 beta 4 2010-03-08 10:54:23 -08:00
James Cook 75cc897c06 Underlined display names now update reliably. 2010-03-03 10:10:55 -08:00
Vadim Savchuk dbdf02cc0d Additional commit for EXT-4574 ([BSI] Unhelpful tooltip for Partner and Group links in Profile).
Fixed tooltip for agent SLURLs.

--HG--
branch : product-engine
2010-03-03 16:42:05 +02:00
Vadim Savchuk f75f19be93 Fixed bug EXT-4574 ([BSI] Unhelpful tooltip for Partner and Group links in Profile).
For wiki-style links ([<URL> <label>]) we now show the tooltip corresponding to the URL type.

--HG--
branch : product-engine
2010-03-03 16:40:38 +02:00
James Cook fe8d015851 Merge 2010-03-02 14:06:23 -08:00
Andrew Dyukov 16b284971e Fixed normal bug EXT-4964 (Invalid SLURL detection does not detect invalid 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-22 19:22:43 +02:00
James Cook ee81adb01b Preference to set what fields name tags display, and
first attempt at "use display names" menu item which
doesn't work yet
2010-02-18 18:46:41 -08:00
James Cook 65d388d162 Fix display of SLID-only accounts - prototype display name code was
putting duplicate name in parentheses.
2010-02-16 11:58:21 -08:00
Vadim Savchuk a301ad63c2 Fixed bug EXT-5290 (TP failed if try to teleport from 'Teleport completed from...' toast).
Reason: LLUrlEntrySLURL::getLocation() failed to parse maps.secondlife.com SLURLs (though worked fine for slurl.com ones).

--HG--
branch : product-engine
2010-02-16 17:58:41 +02:00
James Cook c16591c046 Per-avatar customizable icons next to name links in text
Changed LLUrlEntryAgent callbacks to handle both link label and icon
Eliminated legacy LLNameCache file loading
Reviewed with Kelly
2010-02-12 16:12:12 -08:00
James Cook c2373fb5a6 Created stub LLAvatarNameCache for display name lookup, as
well as LLAvatarName base data object.
Reviewed with Kelly.
2010-02-11 16:39:15 -08:00