Commit Graph

171 Commits (405f5c879c44f32635dcb94de2c7dfb9e4a8673a)

Author SHA1 Message Date
Mnikolenko ProductEngine 25547d320a MAINT-4210 FIXED Don't try to replace wiki-link with label if it's not correct(contains url in label part). 2014-08-26 12:02:22 +03:00
Cho f10f3d2fde Added URL menu for experience profile links for ACME-1469 2014-06-02 21:16:28 +01:00
dolphin 48fece4473 Merge with 3.7.7-release 2014-05-07 11:14:26 -07:00
dolphin 74dcc04e69 Updated experience cache to get a const reference to xp data 2014-03-17 15:57:15 -07:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
dolphin 34c12d009c Merge 2014-03-10 13:06:06 -07:00
simon cfadbe631f Revert earlier back-out for MAINT-535 ... it's back in 2014-01-10 13:15:19 -08:00
simon f291995dac Revert changes made for MAINT-535 to test in a release cohort. 2014-01-07 15:18:29 -08:00
dolphin 48e1e10fd6 Added LLUrlEntryExperienceProfile to link to experience profiles
Added LLExperienceHandler to handle experience links
Updated LLSidepanelItemInfo to use profile links
2013-09-23 11:44:21 -07:00
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07:00
dmitry ea14f690e2 MAINT-535 Wiki-style link markup hides potentially malicious secondlife: app URLs
Partial fix: disabled URLs in the 'label' part of Wiki-style link
2013-10-10 12:00:10 +03:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
mberezhnoy 882ab04ef3 CHUI-809 (Right-click menu on user name in compat chat mode doesn't have "IM")
Added callback for friendship checking
2013-06-13 20:21:24 +03:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Merov Linden c2d332a89c CHUI-580 : WIP : Added disconnect of callbacks once they're called to prevent filling up the callback queue 2012-12-17 20:16:33 -08:00
Merov Linden 3d137bae5c Merge with viewer-chui 2012-12-17 19:29:35 -08:00
Merov Linden 6fe7144104 CHUI-580 : WIP : Protect callback connections passed to LLAvatarNameCache::get() where necessary 2012-12-17 18:59:01 -08:00
Merov Linden 9b556fb3fe CHUI-599 : Use the account name in all places that are not UI related but use avatar names to index, search and other code only uses. 2012-12-14 14:19:17 -08:00
Merov Linden 3a49beed0e CHUI-580 : WIP : Change the display name cache system, deprecating the old protocol and using the cap (People API) whenever available. Still has occurence of Resident as last name to clean up. 2012-12-05 20:25:46 -08:00
Vadim ProductEngine ba129fff47 STORM-632 ADDITIONAL_FIX Use non-greedy regexp match to enable multiple <nolink>...</nolink> clauses in a single textbox. 2011-08-12 16:32:47 +03:00
Vadim ProductEngine f695f8d112 STORM-632 ADDITIONAL_FIX Disallow showing URL-like avatar display names as Web links in the ShareItemsConfirmation notification.
Updating the <nolink> tag parsing regexp to enable multiple <nolink>...</nolink> clauses in a single textbox.
2011-08-08 23:46:23 +03:00
Merov Linden c6895302ed STORM-797 : pull in viewer-development 2011-01-12 11:12:56 -08:00
Vadim ProductEngine dda4150e01 STORM-393 FIXED Changed group SLURL color to be the same as in other URLs.
By the way, removed "AgentLinkColor" color which has been used since STORM-579 was fixed.
2011-01-06 15:51:38 +02:00
Seth ProductEngine 376ee7a3f9 STORM-797 FIXED Added parcel SLURL rendering with human readable parcel names.
- Added parcel info observer to LLUrlEntryParcel.
- Added notifying LLUrlEntryParcel by LLRemoteParcelInfoProcessor when parcel data arrives.
- Added notifying LLUrlEntryParcel about user login, changing host and viewer connection state to use this data in remote parcel requests.
2010-12-30 18:18:33 +02:00
Vadim ProductEngine abda07fb77 STORM-796 FIXED Implemented rendering /app/region/ SLapps into human-readable strings.
Example: secondlife:///app/region/Ahern/10/20/30/ is displayed as "Ahern (10,20,30)".
2010-12-16 20:22:32 +02:00
Richard Linden ca2141ce90 merge with viewer-dev 2010-12-08 16:04:07 -08:00
Seth ProductEngine 7ed0938226 STORM-579 FIXED SLURLs color for residents and objects names in plain text chat match the user setting for "URLs" in the Color tab in Prefs.
Avatar names SLURLs now use the user color setting for "URLs" everywhere across the viewer.
2010-12-03 20:45:53 +02:00
Richard Linden d276950c8d build fixes 2010-11-15 17:03:52 -08:00
Richard Linden 50d21a75a7 merge 2010-11-15 15:52:54 -08:00
Oz Linden b657516f72 pull beta changes back to development 2010-11-08 16:47:46 -05:00
Kent Quirk bc7b6411d9 SEC-784 2010-11-05 18:39:26 -04:00
Vadim ProductEngine f3d4643b59 STORM-489 FIXED <nolink>'ed text rendered as URL
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-28 23:03:09 +03:00
Vadim ProductEngine 07353619d0 STORM-297 FIXED Fixed "<nolink>" text appearing in confirmation message if there is "<" symbol in Landmarks name.
Modified the "<nolink>...</nolink>" clause parsing regexp to allow "<" in the middle.
2010-10-22 19:39:38 +03:00
callum f5b3fc596d Add support for debug setting to disable link highlight & follow in URLs that appear in XUI widgets 2010-10-06 15:34:32 -07: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 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
James Cook 42176145c9 Converted names build from avatar object LLNameValue pairs to SLID
Added temporary getDisplayName() to LLCacheName
Moved temporary placeholder display names into LLCacheName
Eliminated rarely used LLAgentUI::buildName in favor of buildFullName
Standardized buildFullName capitalization
2010-02-08 14:55:30 -08:00
James Cook 88350edbcb merge 2010-02-03 14:13:56 -08:00
James Cook d489216b6e Moved LLUrlEntryAgent back into llui library in prep for merge 2010-02-03 12:48:40 -08:00
Eugene Mutavchi 8c1618ca5a Fixed major bug EXT-4876 (Switch from slurl.com to maps.secondlife.com)
--HG--
branch : product-engine
2010-02-03 19:38:12 +02:00
Lynx Linden e563a07659 DEV-32540: Lots of object IM and SLurl improvements
- Don't let object names that are URLs override links to display the
  remote object inspector

- Don't hyperlink the object name in the remote object inspector

- Made the <nolink>...</nolink> regex more robust and made it support
  non-URLs between the tags, so that we don't get random <nolink> tags
  when trying to disable URLs in user-typed text.

- Improved the llurlentry unit test and added some more test cases.

- Hooked up another LLViewerMessage code path to objectim SLapps to
  pass down the owner and slurl information.

- Made a few LLUrlEntryBase methods be const methods, because they are

- Fixed a bug in the remote object inspector where it would never show
  the teleport URL.
2010-02-02 17:19:14 +00:00
James Cook 146e9d5e4d Support returning full_name (and SLID) for LLCacheName::get() calls
Changed callback signature to full_name instead of first_name,last_name
Eliminated all calls to legacy (non-signal/non-boost-bind) lookup mechanism
Change Pay dialog names to SLURL links
Tweaked layout of Pay Resident and Pay via Object floaters to make SLURLs fit
Consolidate name first + " " + last concatenation in LLCacheName::buildFullName()
Reviewed with Kelly
2010-02-01 17:06:18 -08:00
Lynx Linden 4d6c9e3e17 EXT-4678: Support <nolink>...</nolink> to turn off URL hyperlinking.
We are running into a bunch of places where we don't want to allow
hyperlinking of URLs like secondlife.com in text boxes. I've therefore
added a new type of URL regex that disables URL hyperlinking. Simply
enclose the URL in a <nolink> tag, e.g.:

  <nolink>secondlife.com</nolink>
2010-01-29 14:30:26 +00:00
James Cook 40907986d4 Pull llurlentryagent into newview so I can compile/link faster 2010-01-22 18:29:29 -08:00
James Cook dd9bfb6d85 LLCacheName and LLUrlEntryAgent now understand SLIDs - accounts
with "Resident" as last name should not display that name.
Also added test display names.
2010-01-22 16:52:53 -08:00
Lynx Linden c6108f0fad EXT-4125: Regexes hurt my head!
Updated the regex to match a free URL in plain text with no http:
protocol. This now explicitly does not match e-mail addresses, such as
test@lindenlab.com (yay negative lookbehind regexes). It additionally
matches URLs with a port or path after it, e.g., secondlife.com/status.

I've added a bunch more unit tests to asset positive and negative
matches for this regex, because no human can do this in their head.
2010-01-15 11:07:37 +00:00
Lynx Linden 92b569a607 EXT-3928: Escape group names in the profile panel URLs. 2010-01-11 15:05:01 +00:00
Tofu Linden f446ae4767 DEV-44732 - a better fix. 2010-01-04 16:25:05 -08:00
Tofu Linden e8659e0e13 DEV-44732 avoidable false-positives on automatic URL finding in chat 2010-01-04 15:11:23 -08:00
Lynx Linden d1eb2948f8 EXT-3558: Don't escape '#' chars for URLs in text.
Added '#' to the list of chars that are not escaped when escaping a
URL in a text editor/box. Now, clicking on a link with '#' in text
chat will open the URL in your browser with the '#' intact.
2009-12-21 14:33:20 +00:00
Lynx Linden e33ebe2b48 EXT-3460: Update to URL hyperlinking with no protocol.
We no longer treat ":" or "/" as valid chars before a .com, .net,
.edu, or .org string when trying to match a URL with no protocol
(i.e., no http:// prefix).
2009-12-21 11:35:37 +00:00
Lynx Linden 1ab022df43 EXT-3122: Added support for URLs without an explicit protocol.
You can now enter URLs like "www.google.com", "secondlife.com", or
"www.google.com/search?q=second%20life" and these will be hyperlinked.
2009-12-10 15:33:05 +00:00