Commit Graph

45 Commits (5fa00a67af6364554c05eb3ca0339770fa6da455)

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Roxie Linden b11a625e6f Automated merge with a few fixups for code review comments 2010-03-01 15:31:04 -08:00
Roxie Linden a2efe4bb41 automated merge 2010-02-26 19:18:15 -08:00
Roxie Linden 5352954eb6 automated merge 2010-02-26 17:34:39 -08:00
Roxie Linden 13d4257868 automated merge 2010-02-26 12:02:34 -08:00
Roxie Linden 5c73a90835 automated merge 2010-02-25 21:20:45 -08:00
Roxie Linden 0bf246ed66 Automated merge 2010-02-25 00:17:42 -08:00
Denis Serdjuk da8de2b674 implemented Task EXT-2304 Offer Notifications should include a link that highlights the landmark or item in the appropriate side panel
Changes:
1.highlighting of landmarks was broken by  LLInventoryPanel::getActiveInventoryPanel().
2. escaping of urls

--HG--
branch : product-engine
2009-12-07 19:42:11 +02:00
Denis Serdjuk 83c8f43f8d implemented Task EXT-2304 Offer Notifications should include a link that highlights the landmark or item in the appropriate side panel
Changes:
 This task had been already  implemented. llurlentyinventory and llurlregistry have been changed to correct parsing of offer url

--HG--
branch : product-engine
2009-12-04 14:15:08 +02:00
Eric M. Tulla (BigPapi) a3930c7ff7 Inventory Offer changes and clickable inventory slurls 2009-11-20 19:27:33 -05:00
Lynx Linden daefef6e66 DEV-2925: Remove support for secondlife:///app/objectim URLs.
These are no longer generated in Viewer 2.0 (instead we use
notifications to send object IMs to the user), so there's no
need to look for them in every textbox. Users can get details
on any objects spamming them via the new remote object inspector.
2009-11-12 12:43:18 +00:00
Lynx Linden c10a40e54e DEV-41358: corrected a minor typo in a comment and refactored some
code to avoid duplication.
2009-11-04 11:53:29 +00:00
Lynx Linden 00e56b0907 DEV-41358 DEV-41361: Added support for secondlife:///app/worldmap
SLurls to the LLUrlRegistry. These are now displayed with the more
human-readable label of "Show Map for XXXX" and sport a context menu
with various operations.

I also added "Show on Map" options to the context menus for other
location-based SLurls.

I also internationalized the text for "Teleport to" and the new "Show
Map for" strings.
2009-11-03 19:08:11 +00:00
James Cook 79a0e517ee Group SLURL links are white, color configurable in colors.xml
Reviewed with Erica.
2009-10-20 00:36:17 +00:00
James Cook 5d8079a108 EXT-1518 Show "nobody" for null UUID avatar SLURL links, "none" for null group SLURL links.
Show "Loading..." while looking up real names.
Fix group inspector "view details" button not working.
Reviewed with Ambroff.
2009-10-20 00:33:02 +00:00
James Cook a4c657a49d Group inspectors now work. They are hooked up to About Land, build tools floater, and anywhere secondlife:///app/group URLs appear. Reviewed with Leyla. 2009-10-16 23:20:05 +00:00
James Cook ada0f4fa22 Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml

Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-10-03 23:40:28 +00:00
Martin Reddy 47abd55908 EXT-944 EXT-1026: reverting my previous fix for these crashes.
This didn't work on Windows because wchar_t is 2 bytes on that
platform, not 4 bytes (whereas llwchar is 4 bytes everywhere).
Boost's regex methods need to work on wchar_t, but I believe
that using a UTF-16 string would still be prone to crashing on
Windows as UTF-16 is still a variable-length encoding. Besides,
trying to compile a UTF-16 solution generates weird link errors.

Instead, I'm going to fix this problem a different way. And
I'm starting by reverting the previous attempt. Thanks Win32.
2009-09-23 13:57:06 +00:00
Martin Reddy 12762053e5 EXT-944 EXT-1026: converted the LLUrlRegistry::findUrl() method to
work on an LLWString instead of a std::string, so that we don't have
to worry about character offsets for variable-length-encoded UTF-8
strings.

This was causing crashes whenever we would try to show a textbox with
a URL and foreign characters (> 1 byte chars). Damn, I suck!
2009-09-22 18:00:16 +00:00
Martin Reddy 7cd1020f29 DEV-39188: Removed the custom support for secondlife:///app/events and
secondlife:///app/classifieds URLs because we do not have handlers for
these SLAPPs in 2.0.

Added support for secondlife://<location/<x>/<y>/<z> URLs, in addition
to the http://slurl.com SLURLs.

Also optimized LLUrlRegistry:findUrl() so that it avoids lots of
expensive regex calls when there is no URL in the text.
2009-09-14 20:01:20 +00:00
Martin Reddy 330840af7c Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into
Viewer 2.0 (viewer-2.0.0-3). This provides support for clickable Urls
in text editors and textboxes, with right-click context menus,
tooltips, and alternate link labels. This includes alert boxes, the
login progress window, local chat and IM interfaces, etc. As well as
context menus for avatars and groups in list widgets. Includes fixes
for the following individual JIRAs:

DEV-8763 VWR-10636: Hyperlinks in alert dialogs should be selectable (clickable)!
DEV-38829 EXT-742: Remove LLLink class
DEV-35459 VWR-14679: SLURLs and teleport Links not parsed properly
DEV-19842 VWR-8773: Closing parenthesis ")" breaks urls
DEV-21577 VWR-9405: In-world SLURLs containing "(" or ")" are not treated as a hyperlink in chat
DEV-37652 SEC-435: Object Chat/IMs are untraceable (VWR-2388) Fix has left flaw
DEV-10353: URLs in chat log terminated incorrectly when newline in chat
DEV-2925: In chat history, use a teleport hyperlink as source name for object IMs
DEV-36192: Need a way to copy Avatar names and Group names
DEV-2926: Allow viewer hyperlinks to have different text than the actual url
DEV-27253: Add easy way to copy URLs from viewer chat
DEV-38274: Make About Second Life window use new Url hyperlinking features
DEV-39076: No url support in Text Editors
DEV-7476 VWR-2172: Add hyperlinks to chat console for easier access
DEV-7475: Add hyperlinks to notecards!
DEV-35375 EXT-128: HTTPS urls aren't loaded in the internal browser by click

Master JIRA issues: DEV-32819, DEV-323820, DEV-7474

Testing performed against QAR-1789

svn merge -r 131623:131889 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-slurl-3
svn merge -r 131978:132515 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-slurl-3
2009-09-04 12:11:27 +00:00
Roxanne Skelly 7a64aad1de DEV-34822 - merge 1.23
merge -r119443 - basic slurl handling
ignore dead branch
2009-07-09 20:56:23 +00:00