33d1aa30ab
Merge from dessie/viewer-release
2010-07-06 17:51:07 -07:00
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
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
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
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
a91d10dc18
Merge
2010-05-25 11:41:33 -07:00
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
f682c996d2
DEV-50271 FIX SLURL support for non-clickable display names
2010-05-24 18:29:29 -07:00
4ea7d2de9f
DEV-50271 FIX SLURL support for non-clickable display names
...
reviewed by James
2010-05-24 17:25:35 -07:00
0df5c0e879
DEV-50013 Tooltip for SLAPP agent inspect links
...
Reviewed with Erica (language) / Leyla (code)
2010-05-20 14:15:27 -07:00
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
8b52454990
merge pull from dessie/viewer-public, picking up SLE code
2010-05-13 15:47:32 -07:00
31a0d236d5
Clean up merge-fight about getIcon() const-ness
2010-05-11 17:26:29 -07:00
2b7153c26a
merge from dessie/viewer-public right before SLE code landed
2010-05-11 16:11:09 -07:00
a11ec0c89f
Automated merge
2010-05-04 16:09:14 -07:00
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
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
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
8ba5517a08
Automated merge
2010-04-07 13:20:33 -07:00
658ccc3e85
Re-insert backed out SLE checkin so we can fix it
2010-04-07 11:08:04 -07:00
adce2ecdf8
PE merge from pe-viewer-trunk
2010-04-07 13:03:35 +01:00
8da371b0f0
merge
2010-04-07 12:16:36 +01:00
0bb3f144c0
Backed out changeset 63b699f90efd
2010-04-07 10:37:07 +01:00
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
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
e46f128d20
PE merge
2010-04-02 12:35:24 +01:00
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
ecc2c72650
Merge latest viewer-hotfix, approximately equal to Viewer 2.0 final
2010-03-29 16:55:22 -07:00
18b7ab0018
Weekly automated merge from viewer 2.0
2010-03-22 16:12:41 -07:00
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
20379fecd9
automated merge
2010-03-08 21:39:38 -08:00
18ebacefcf
Merge with viewer 2 beta 4
2010-03-08 10:54:23 -08:00
75cc897c06
Underlined display names now update reliably.
2010-03-03 10:10:55 -08:00
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
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
fe8d015851
Merge
2010-03-02 14:06:23 -08:00
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
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
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
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
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
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
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
88350edbcb
merge
2010-02-03 14:13:56 -08:00
d489216b6e
Moved LLUrlEntryAgent back into llui library in prep for merge
2010-02-03 12:48:40 -08:00
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
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
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
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
40907986d4
Pull llurlentryagent into newview so I can compile/link faster
2010-01-22 18:29:29 -08:00
Leyla Farazha