e7eaa94dfa
Merge VR
2016-01-15 13:36:38 -08:00
4b7fb09a47
Merge.
2015-12-21 19:16:34 +01:00
40699b9663
MAINT-5498 LLUrlEntry regex refactoring
...
Improved LLUrlEntryHTTP, extended a test
2015-12-15 01:17:26 +02:00
1d91bb3bc5
Merge Firestorm LGPL tip
2015-12-03 10:34:52 +01:00
d5e65beb9d
FIRE-17152: Lindens Home Home control panel House Control panel URL is wrong
2015-12-01 00:43:27 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
68739bc569
Merge Viewer-Bear
2015-10-27 01:31:15 +01:00
c218e524b2
Merge - Step 1; Still enough to do.
2015-10-26 20:20:13 +01:00
52d30bbbe9
MAINT-5464 FIXED Do not add badge to links that have a port number specified.
2015-10-23 07:52:43 +03:00
53b947e039
Merge from viewer release.
2015-10-19 12:03:08 -07:00
057bcc92ec
MAINT-8552 FIXED Secure map links do not parse in chat and SL icon is not displayed
2018-04-19 16:48:46 +03:00
8913ed6692
Changes from code review with Nat
2015-09-03 16:59:00 -07:00
96e343b49b
MAINT-5575: Convert the Experience cache into a coro based singleton.
...
--HG--
branch : MAINT-5575
2015-09-01 16:13:52 -07:00
7c61728b4b
MAINT-4952: Removed a bit of debug code that got included accidentally and change host == LLHost() to host.isInvalid()
2015-08-24 14:19:30 -07:00
4a7ebe3708
size_t this...
2015-08-22 20:37:43 +02:00
f7e1774fcd
Try to re-allow URLs without protocol again...
2015-08-22 12:40:09 +02:00
5fe09cb64d
Merge Viewer-Bear
2015-08-22 03:13:17 +02:00
62527e6f18
MAINT-5506: Fix ugly timing bug in llurlentry static initialization.
...
The problem was that class-static LLUrlEntryParcel::sRegionHost was being
initialized by copying class-static LLHost::invalid. Naturally, these two
statics are initialized in different source files. Since C++ makes no promises
about the relative order in which objects in different object files are
initialized, it seems we hit a case in which we were trying to initialize
sRegionHost by copying a completely uninitialized LLHost::invalid.
In general we might attempt to address such cross-translation-unit issues by
introducing an LLSingleton. But in this particular case, the punch line is
that LLHost::invalid is explicitly constructed identically to a
default-constructed LLHost! In other words, LLHost::invalid provides nothing
we couldn't get from LLHost(). All it gives us is an opportunity for glitches
such as the above.
Remove LLHost::invalid and all references, replacing with LLHost().
2015-08-18 17:05:29 -04:00
8d34d1a9c5
SL-173 FIXED Allow searching for an experience by SLurl.
2015-08-18 11:22:39 +03:00
805c83bc7a
Simplify fix for FIRE-16642
2015-08-13 20:59:06 +02:00
3273e637f9
FIRE-16642: Show invalid Hypergrid node URIs
2015-08-13 20:35:35 +02:00
96e641b329
MAINT-5451 FIXED A domain name without a top level domain should not be decorated
2015-08-07 11:47:17 +03:00
e62d5ea4e8
MAINT-5019 FIXED Undesired "http://" added to domains sent in chat
...
Completely removed matching of the URLs w/o a protocol
+ Some unit tests
2015-07-29 07:35:08 +03:00
62c748936c
MAINT-5019: Buildfix - added a tests for emails, improved handling of URLs starting with www.
2015-07-15 23:58:56 +03:00
078612e292
MAINT-5019 FIXED Additional cases
2015-07-14 04:39:20 +03:00
79ffc6569b
Merge from viewer-relese and become version 3.8.1
2015-07-01 14:40:05 +03:00
949942c730
merge changes for 3.7.29-release
2015-06-08 16:33:02 -04:00
4ce6691cf8
Merge viewer-xp_tools
2015-06-25 11:57:17 +02:00
bb87365c37
Merge viewer-release, become version 3.7.29
2015-04-28 13:36:35 +03:00
a219cf1c98
Merge viewer-release
2015-04-15 15:07:13 -07:00
cccde14f9b
MAINT-5058 FIXED Get the query string by simple extracting it from whole url.
2015-04-15 13:16:23 +03:00
034fb74d05
merge changes for STORM-2113
2015-04-14 05:39:36 -04:00
a8ef252571
merge changes for 3.7.27-release
2015-04-13 16:23:36 -04:00
5a282abe18
STORM-2113 - uri parsing cleanup and fixes
2015-04-11 15:23:06 -06:00
d7091cd375
FIRE-16298: Fix OpenSim SLURL parsing
2015-06-08 23:21:37 +02:00
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
aabeeadf77
More hammering on the URI fail:
...
* Don't try to parse an unescaped URI - it will fail; unescape the label after parsing
* Use the default tooltip text for the labels
* Set the tooltip for both host and query part of an URI
2015-05-04 10:17:43 +02:00
6477e1c742
More URI unfailing
2015-05-04 00:26:12 +02:00
9be423524d
Merge LL V3.7.27
2015-04-14 22:08:31 +02:00
b5324afb6f
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2015-02-24 21:02:12 -05:00
905431cf60
merge changes for 3.7.25-release
2015-02-24 15:48:28 -05:00
6f3cf79a3a
merge changes for 3.7.24-release
2015-01-13 13:46:45 -05:00
f097c731d6
MAINT-4169 ShowGreyQueryInUrls debug setting was removed and the grey part of the link always appears.
2015-03-04 13:10:58 +02:00
bf51454223
MAINT-4169 FIXED grey out all but domain name in SL-links, same as it's done for non-Linden URLs
2015-01-09 12:10:32 +02:00
427191118e
MAINT-4169 ShowGreyQueryInUrls debug setting was removed and the grey part of the link always appears.
2015-01-19 17:52:06 +02:00
027899963c
merge with 3.7.23-release
2014-12-19 23:20:47 +02:00
23711c9275
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
2014-12-10 08:44:08 -08:00
28e8b8ecdb
MAINT-4683 FIXED Display SLURLs with incorrect coordinates as regular URLs.
2014-12-04 12:40:13 +02:00
c2a516aee1
ACME-1635: Trusted Experiences now referred to as Key Experiences.
2014-11-06 16:25:17 -08:00
86ef6aa5aa
Convenience...
2015-04-02 11:39:30 +02:00
5711dc8fad
FIRE-11330: More changes to prevent names getting stuck if both name request via caps or legacy fail
...
Previous version could lead to a situation where a name request fails both via
caps or legacy, or it will return broken data, with both cases leading to a
callback connection waiting in the callback map and not issuing new requests for
the same name.
With the change, we might request names multiple times again, but handle the
callback only once (first one wins) and disconnect all others waiting, since
callObservers() will make sure all interested parties get notified about the
received name.
2015-04-01 15:39:36 +02:00
7f1f0019d8
Optimize previous fix:
...
We only need to request the name from the name cache once. In case a name has
to be resolved another time while the response to our first request hasn't
arrived yet, do not request it again but just add another observer for that
agent id - it will be called as well once the request is finished.
2015-03-31 13:50:57 +02:00
cd378552e1
FIRE-11330: Possible fix for MAINT-3118
2015-03-30 18:48:52 +02:00
4cdac61634
Change placeholder that is shown while display name is still being fetched to proper placeholder.
2015-03-06 14:08:29 -08:00
6708f8d110
Merge fix #5 : Fix the BUG-8331 fail - removing protocol from the URL will make SLURL barf
2015-02-25 14:06:38 +01:00
b64ddf6776
Optmize LLUrlEntrySeconlifeURL::getLabel() - don't need to extract URL parts if we just return the normalized URL anyway
2015-02-25 12:11:00 +01:00
50894e18a2
Merge fix #3 : Show full normalized trusted URL instead of just the host - we're not playing Jeopardy and want to guess what URL exactly we are opening
2015-02-25 11:05:20 +01:00
22386b18b4
Merge LL 2.7.25
2015-02-24 21:22:32 -08:00
e52d57cba2
Merge LL V3.7.23
2015-01-15 15:44:43 +01:00
c8cfcf8ea1
Fix build issues.
2014-10-16 17:27:44 +03:00
2b8827a55f
MAINT-4169 FIXED Suppress initial display of the path portion of URLs from other users and scripts
2014-10-13 19:14:42 +03:00
99bf150059
MAINT-4582 FIXED Certain URLs which end contain secondlife.com or lindenlab.com incorrectly open the Place Profile floater
2014-10-16 10:41:03 +03:00
6ea75fd4b0
MAINT-4548 & MAINT-4557 FIXED build issues
2014-10-07 18:59:11 +03:00
a25748e11e
MAINT-4119 FIXED Uniquely decorate links on Second Life or Linden Lab domains
2014-10-02 18:20:10 +03:00
89eac2548a
Made it possible to search for experiences with an empty search string, and show experiences with blank names as (untitled experience) for ACME-1585
2014-08-20 01:11:27 +01:00
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
f10f3d2fde
Added URL menu for experience profile links for ACME-1469
2014-06-02 21:16:28 +01:00
48fece4473
Merge with 3.7.7-release
2014-05-07 11:14:26 -07:00
c291b53073
FIRE-1715: Links using FTP protocol are not recognized
2014-08-26 14:07:17 +02:00
74dcc04e69
Updated experience cache to get a const reference to xp data
2014-03-17 15:57:15 -07:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
34c12d009c
Merge
2014-03-10 13:06:06 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
3d1ac7c0ec
Merge LL 3.7.3 (Viewer-Bear fixes)
2014-03-17 14:14:15 -07:00
36ebe743b3
Added SNOW and CTS; Fixed typo in the previous commit
2014-03-01 05:25:58 +01:00
d3f98d02b5
Add FITMESH to jira parcer
2014-02-28 18:37:08 -08:00
cfadbe631f
Revert earlier back-out for MAINT-535 ... it's back in
2014-01-10 13:15:19 -08:00
f291995dac
Revert changes made for MAINT-535 to test in a release cohort.
2014-01-07 15:18:29 -08:00
254cf3f9c0
Let's be safe and exclude all whitespace characters for the objectim SLURL regex
2014-02-01 14:05:11 +01:00
6e7a515c4c
Fix regex for objectim SLURLs to stop after first space so we can use it in messages (SLURL must be encoded to work properly anyway, so there should not be a space in there!)
2014-02-01 13:46:57 +01:00
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
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
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
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
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
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
276c3683ac
Sync projects to match for the jira parser.
2013-10-06 22:30:11 -06:00
2b5ccd9443
updates to jira parcer
2013-10-06 00:18:55 -07:00
07084226bf
Fixed mass per-frame regex from case insensitive check on SEC
2013-10-05 23:52:30 -04:00
5a8d94c50f
Merge LL 3.6.4 pass 1
2013-08-28 00:10:39 -07:00
b484eec92d
Update jira projects for matching, remove archived projects, add new projects
2013-08-16 09:42:38 -06:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
a9ffc0120a
Merged with default tip (Revision 13149a524874)
...
--HG--
branch : RLVa
2013-05-06 23:54:58 +02:00
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
3d137bae5c
Merge with viewer-chui
2012-12-17 19:29:35 -08:00
6fe7144104
CHUI-580 : WIP : Protect callback connections passed to LLAvatarNameCache::get() where necessary
2012-12-17 18:59:01 -08:00
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
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
544569d1f2
FIRE-8319: Make SUP JIRAs link to jira.phoenixviewer.com .
2012-11-24 15:14:31 -06:00
d5824c41b0
Add new "BUG" LL JIRA project and our own "SUP" project to JIRA link parser
2012-09-18 17:22:57 +02:00
24890877d7
FIRE-917: Match case in JIRA link parser to reduce number of false positives
2012-09-18 17:20:32 +02:00
d62390ef93
Added CHOP, MAINT, EXP, SINV, PATHBUG, and DOC to jira parcer; removed ER
...
also alphabetized the list
2012-03-09 17:49:56 -08:00
caee90cf4c
Merged with default tip (Revision f2e17425d895)
...
--HG--
branch : RLVa
2011-11-04 11:46:25 +01:00
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
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
7b0455ba0f
Merged with default tip (Revision 78d1d228709c)
...
--HG--
branch : RLVa
2011-03-19 16:14:42 +01:00
604345b918
Merged with .RLVa tip
...
--HG--
branch : RLVa
2011-02-19 01:12:23 +01:00
c6895302ed
STORM-797 : pull in viewer-development
2011-01-12 11:12:56 -08:00
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
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
922b851a5c
Merged with default tip (Revision 1ed382c6a08b)
...
--HG--
branch : RLVa
2010-12-19 17:32:13 +01:00
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
ca2141ce90
merge with viewer-dev
2010-12-08 16:04:07 -08:00
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
d276950c8d
build fixes
2010-11-15 17:03:52 -08:00
50d21a75a7
merge
2010-11-15 15:52:54 -08:00
dd5ce41d4f
Merged with default tip (Revision 8301f50a65b0)
...
--HG--
branch : RLVa
2010-11-13 17:54:47 +01:00
b657516f72
pull beta changes back to development
2010-11-08 16:47:46 -05:00
bc7b6411d9
SEC-784
2010-11-05 18:39:26 -04:00
e790c1d424
- internal : URL handler for secondlife:///app/agent/<uuid>/rlvanonym
...
-> will be used when there is a need to anonymize "/inspect", "/completename", "/displayname" or "/username" agent URLs
--HG--
branch : RLVa
2010-11-01 20:10:07 +01:00
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
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
e19e95e55f
FIRE-3459: Support for multi-grid hop:// protocol, by ArminW
2011-10-28 18:09:14 -04:00
7394730eaa
Merge up to LL FUI
2011-10-28 02:00:09 -04:00
656f5249a0
Added Jira link parsing
2011-04-10 17:42:58 -07:00
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
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
0a74d15935
Merge between james/viewer-identity-evolution and dessie/viewer-public
2010-09-03 15:30:16 +01:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
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
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
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
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
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
Rider Linden