Commit Graph

112 Commits (bdc94eac5cda3dd6700a1cd462178b7ac3c4cfec)

Author SHA1 Message Date
Ansariel 1d9d378a9b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-19 09:08:43 +01:00
Ansariel 603e04ee3c Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer 2021-08-24 13:18:55 +02:00
Mnikolenko Productengine 8178e51a74 SL-15690 FIXED Wrong URI determination 2021-07-29 19:06:13 +03:00
Ansariel 826ee26272 Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer 2021-06-08 19:55:43 +02:00
Andrey Kleshchev b6ac642db2 SL-15243 Unicode URL validation 2021-06-03 19:50:08 +03:00
Ansariel 7458601374 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-02 00:05:53 +01: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
Ansariel 1461e9bbb0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-01-17 19:24:26 +01:00
Ansariel 52b3bb404c Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-01-17 12:38:03 +01:00
Ansariel 5717f38411 FIRE-30611: "You" in transcript is underlined 2020-12-16 11:25:15 +01:00
Ansariel 240757c0d0 Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer 2020-08-20 16:52:04 +02: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
Ansariel 98129be5ef Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer 2020-06-17 15:45:05 +02:00
Mnikolenko Productengine 9608b6dcac SL-13433 Viewer should recognizes ipv6 links 2020-06-11 17:41:59 +03:00
Ansariel 0be6b40b25 FIRE-24262: Introduce an explicit label for "wear_folder" SLURLs to mitigate its abuse of trying to fool people into wearing the bunny default avatar 2019-08-14 22:39:17 +02:00
Ansariel 7e7984fcfd Merge viewer-neko 2018-05-01 18:42:59 +02:00
Ansariel bbbb8765fc Merge viewer-bear 2017-02-16 19:24:15 +01:00
Mnikolenko Productengine f8790210dd MAINT-7103 New URI namespace /legacyname 2017-02-03 10:42:01 +02:00
Ansariel cf9528018e Add Firestorm help SLUrl 2016-11-29 19:09:43 +01:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05: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
Ansariel f7e1774fcd Try to re-allow URLs without protocol again... 2015-08-22 12:40:09 +02:00
Ansariel 5fe09cb64d Merge Viewer-Bear 2015-08-22 03:13:17 +02: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 078612e292 MAINT-5019 FIXED Additional cases 2015-07-14 04:39:20 +03:00
Ansariel 4ce6691cf8 Merge viewer-xp_tools 2015-06-25 11:57:17 +02:00
Oz Linden 949942c730 merge changes for 3.7.29-release 2015-06-08 16:33:02 -04:00
simon a219cf1c98 Merge viewer-release 2015-04-15 15:07:13 -07:00
Oz Linden 034fb74d05 merge changes for STORM-2113 2015-04-14 05:39:36 -04:00
Cinder 5a282abe18 STORM-2113 - uri parsing cleanup and fixes 2015-04-11 15:23:06 -06:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Ansariel 9be423524d Merge LL V3.7.27 2015-04-14 22:08:31 +02:00
Nat Goodspeed b5324afb6f Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2015-02-24 21:02:12 -05:00
Mnikolenko ProductEngine 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
Mnikolenko ProductEngine 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
maksymsproductengine 027899963c merge with 3.7.23-release 2014-12-19 23:20:47 +02:00
Mnikolenko ProductEngine 28e8b8ecdb MAINT-4683 FIXED Display SLURLs with incorrect coordinates as regular URLs. 2014-12-04 12:40:13 +02:00
Ansariel 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
Ansariel 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
Ansariel cd378552e1 FIRE-11330: Possible fix for MAINT-3118 2015-03-30 18:48:52 +02:00
Ansariel 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
Tank_Master 22386b18b4 Merge LL 2.7.25 2015-02-24 21:22:32 -08:00
Ansariel e52d57cba2 Merge LL V3.7.23 2015-01-15 15:44:43 +01:00
maksymsproductengine 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
Mnikolenko ProductEngine 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
maksymsproductengine 6ea75fd4b0 MAINT-4548 & MAINT-4557 FIXED build issues 2014-10-07 18:59:11 +03:00
maksymsproductengine a25748e11e MAINT-4119 FIXED Uniquely decorate links on Second Life or Linden Lab domains 2014-10-02 18:20:10 +03:00
Mnikolenko ProductEngine 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
dolphin 48fece4473 Merge with 3.7.7-release 2014-05-07 11:14:26 -07:00