Commit Graph

195 Commits (557fb2cccdb8f267c38f0b2dc88ce939bf1ccc21)

Author SHA1 Message Date
Andrey Lihatskiy b18f328c08 Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llmachineid.cpp
2021-09-03 00:18:26 +03:00
Andrey Lihatskiy 6c8e6f033b Merge branch 'master' into DRTVWR-521-maint
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llerror.cpp
#	indra/llui/llnotifications.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewermacosx.cpp
2021-07-20 02:48:05 +03:00
Andrey Lihatskiy 2ded530f93 Merge branch 'master' into DRTVWR-522-maint
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llappcorehttp.cpp
#	indra/newview/llappcorehttp.h
2021-07-19 22:20:45 +03:00
Andrey Kleshchev b6ac642db2 SL-15243 Unicode URL validation 2021-06-03 19:50:08 +03:00
Andrey Lihatskiy e00edbeb4a Merge branch 'master' into DRTVWR-522-maint
# Conflicts:
#	doc/contributions.txt
2021-04-30 03:04:06 +03:00
Andrey Kleshchev 3f31901640 Merge master (DRTVWR-515) into DRTVWR-516-maint
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/llcommon/llcoros.cpp
#	indra/llmessage/llcoproceduremanager.cpp
#	indra/newview/llfloaterfixedenvironment.cpp
#	indra/newview/llfloaterimsessiontab.cpp
2021-04-29 21:00:25 +03:00
Mnikolenko Productengine 94ce45441d SL-15082 regexp fix 2021-04-10 01:38:17 +03:00
Mnikolenko Productengine 1dfbce8169 SL-15082 fix for app/region SLURLS 2021-04-08 16:17:00 +03:00
Andrey Kleshchev 609a26b59a Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master into DRTVWR-515-maint
# Conflicts:
#	autobuild.xml (llca)
#	indra/llwindow/llwindow.h (SL-13507 vs SL-5894)
#	indra/newview/llscenemonitor.cpp (SL-14422)
#	indra/newview/llvovolume.cpp (SL-12069)
2021-02-01 22:28:15 +02:00
Andrey Lihatskiy f047e2236c Merge branch 'master' into DRTVWR-522-maint 2021-02-01 22:14:56 +02:00
Andrey Lihatskiy cd831c4228 Merge branch 'master' into DRTVWR-516-maint 2021-02-01 22:11:04 +02:00
Mnikolenko Productengine 03921adb12 SL-2202 Add exception handling around boost::regex_match() calls in the viewer 2021-01-11 17:07:03 +02:00
Mnikolenko Productengine 071e0ff36b SL-14494 FIXED llRequestURL() generated URLs are no longer recognized by the viewer as Second Life hosted URLs 2021-01-04 17:29:50 +02:00
Andrey Lihatskiy fb1238a1ce Merge branch 'master' into DRTVWR-516-maint
# Conflicts:
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.cpp
#	indra/newview/llenvironment.cpp
2020-11-13 18:26:56 +02:00
Andrey Lihatskiy 0bba892bb0 Merge branch 'master' into DRTVWR-515-maint
# Conflicts:
#	indra/newview/llfloatereditextdaycycle.cpp
#	indra/newview/llfloaterfixedenvironment.cpp
2020-11-13 18:22:43 +02:00
Andrey Lihatskiy 0303dd8179 Merge branch 'master' into DRTVWR-513-maint
# Conflicts:
#	autobuild.xml
#	indra/llui/llfolderviewmodel.h
#	indra/newview/lltexturecache.cpp
#	indra/newview/llviewermenu.h
#	indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-11-11 22:14:24 +02:00
Andrey Kleshchev a5c8b1cbe2 SL-13729 Performance of LLUI and LLRender2D #2 2020-09-17 20:39:45 +03:00
Mnikolenko Productengine ba04feea1f SL-13618 FIXED uri's stuck showing "Loading..." in chat or dialog if more than one name is not cached. 2020-08-10 12:11:14 +03:00
Mnikolenko Productengine 9608b6dcac SL-13433 Viewer should recognizes ipv6 links 2020-06-11 17:41:59 +03:00
Mnikolenko Productengine 668e6e359b SL-13048 FIXED Status Blog URL does not show Official Second Life web page icon 2020-04-16 16:44:31 +03:00
AndreyL ProductEngine 56056aa198 Upstream merge from viewer-neko 2019-11-27 23:20:03 +02:00
AndreyL ProductEngine 84f3b2865f Merged in lindenlab/viewer-release 2019-11-12 00:39:07 +02:00
andreykproductengine c61d0f4297 DRTVWR-493 LLUI to LLParamSingleton 2019-08-10 15:31:03 +03:00
maxim_productengine 6b67fd1211 SL-11551 tilia-inc.com as an official Linden Lab URL should have SL icon 2019-07-05 11:44:36 +03:00
maxim_productengine 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
Mnikolenko Productengine 3d7dedff26 MAINT-8023 Viewer breaks URLs with internationalized domain names 2017-11-24 17:58:02 +02:00
Mnikolenko Productengine d65e6e8382 MAINT-7386 FIXED app/objectim slurl consumes the rest of the chat string 2017-05-05 17:47:36 +03:00
Mnikolenko Productengine f8790210dd MAINT-7103 New URI namespace /legacyname 2017-02-03 10:42:01 +02:00
Mnikolenko Productengine 2f40972dd8 MAINT-7031 /displayname & /completename should perform regardless of "View Display Names" viewer setting. 2017-01-11 13:52:40 +02:00
Mnikolenko Productengine 3b328a3880 MAINT-6929 [Contribution] E-mail links are not parsed correctly when top level domain is over 6 characters. 2016-11-15 13:00:47 +02:00
Mnikolenko Productengine 377683a8ed MAINT-6648 FIXED [SECURITY] Link tags do not filter unicode and allow for easy URL spoofing. 2016-08-23 13:01:19 +03:00
Mnikolenko Productengine e76b5643ef MAINT-6608 FIXED URI parser problem with links with username, password 2016-08-10 13:31:25 +03:00
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04:00
Rider Linden b8c1976460 Merge 2016-03-17 13:14:21 -07:00
Oz Linden 31f3db0291 merge changes for DRTVWR-417 2016-03-16 13:08:06 -04:00
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
Rider Linden e7eaa94dfa Merge VR 2016-01-15 13:36:38 -08:00
AndreyL ProductEngine 40699b9663 MAINT-5498 LLUrlEntry regex refactoring
Improved LLUrlEntryHTTP, extended a test
2015-12-15 01:17:26 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
AndreyL ProductEngine 52d30bbbe9 MAINT-5464 FIXED Do not add badge to links that have a port number specified. 2015-10-23 07:52:43 +03:00
Rider Linden 53b947e039 Merge from viewer release. 2015-10-19 12:03:08 -07:00
Rider Linden 8913ed6692 Changes from code review with Nat 2015-09-03 16:59:00 -07:00
Rider Linden 96e343b49b MAINT-5575: Convert the Experience cache into a coro based singleton.
--HG--
branch : MAINT-5575
2015-09-01 16:13:52 -07:00
Rider Linden 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
Nat Goodspeed 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
Mnikolenko ProductEngine 8d34d1a9c5 SL-173 FIXED Allow searching for an experience by SLurl. 2015-08-18 11:22:39 +03:00
Mnikolenko ProductEngine 96e641b329 MAINT-5451 FIXED A domain name without a top level domain should not be decorated 2015-08-07 11:47:17 +03:00
AndreyL ProductEngine 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
AndreyL ProductEngine 62c748936c MAINT-5019: Buildfix - added a tests for emails, improved handling of URLs starting with www. 2015-07-15 23:58:56 +03:00
AndreyL ProductEngine 078612e292 MAINT-5019 FIXED Additional cases 2015-07-14 04:39:20 +03:00