Commit Graph

38 Commits (bea2dfbc22bb2d80755dcf9daf810e1ea0329c2d)

Author SHA1 Message Date
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
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 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
Richard Linden f79ac664dd merge 2010-06-03 14:15:11 -07:00
Yuri Chebotarev 5c263cdc64 EXT-6333 FIX introduce new segments - LLLineBreakSegment and LLImageSegment
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/241/

--HG--
branch : product-engine
2010-06-03 10:38:03 +03: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 2b7153c26a merge from dessie/viewer-public right before SLE code landed 2010-05-11 16:11:09 -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
Vadim Savchuk 4a997e9627 Merge from default branch
--HG--
branch : product-engine
2010-04-06 17:17:33 +03:00
Eugene Mutavchi d7579203c0 Partial fix for reopened EXT-6357 (SLapp for object chat does display an inspector) - changed the order of registering SLURLs so the LLUrlEntryObjectIM will be handled before LLUrlEntryPlace.
Reviewed by Vadim Savchuk.

--HG--
branch : product-engine
2010-04-02 19:27:27 +03: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 18ebacefcf Merge with viewer 2 beta 4 2010-03-08 10:54:23 -08: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 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 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
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
James Cook 40907986d4 Pull llurlentryagent into newview so I can compile/link faster 2010-01-22 18:29:29 -08:00
Lynx Linden bf7494017f EXT-3486: Support SLapps and URLs in the nav bar.
If the user enters a string into the navigation bar that is not
recognized as an SL location, the behavior is now:

- handle any secondlife:// SLapps, or
- open any http: or https: URLs in the media browser, or
- otherwise, send the text to the search floater
2009-12-21 15:49:52 +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
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 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
Martin Reddy 7aa859b7f4 EXT-1566: Fixed another case of UTF-8 vs UTF-32 coding error for SLURL
parsing in text editors. Any time we are looking up segment start/end
ranges we should do this on a wide string.

Also added a convenience LLUrlRegistry::hasUrl() method to easily
determine if a string contains a valid SLURL.
2009-10-16 14:04:23 +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 7b2737e0e1 EXT-944 EXT-1026: cleaning up my quick fix for these issues.
I've now added an explicit LLUrlRegistry::findUrl() method
for LLWStrings. This deals with correcting the start/end
range for the url appropriately. Now the API can be used
without worrying about utf8/utf32 character offset issues.

Internal JIRAs: DEV-40127 DEV-39966.
2009-09-24 10:41:08 +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