Ansariel
|
b157ab47c0
|
Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/newview/llagentui.cpp
# indra/newview/llcallingcard.cpp
# indra/newview/llfloateravatarrendersettings.cpp
# indra/newview/llimview.cpp
# indra/newview/llimview.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/skins/default/xui/de/floater_tools.xml
# indra/newview/skins/default/xui/en/floater_display_name.xml
# indra/newview/skins/default/xui/en/floater_tools.xml
# indra/newview/skins/default/xui/es/floater_tools.xml
# indra/newview/skins/default/xui/ru/floater_tools.xml
|
2023-01-12 16:56:08 +01:00 |
|
Maxim Nikolenko
|
d5257abdb1
|
SL-18734 certain links are not displayed appropriately
|
2022-12-02 00:45:34 +02:00 |
|
Ansariel
|
1d9d378a9b
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-11-19 09:08:43 +01:00 |
|
Andrey Lihatskiy
|
49dd88e86c
|
Merge branch 'master' into DRTVWR-540-maint
# Conflicts:
# indra/newview/llfloatereditextdaycycle.cpp
# indra/newview/llviewerinput.cpp
|
2021-11-19 04:45:15 +02: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
|
23693c23a7
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-02-03 23:50:45 +01:00 |
|
Andrey Lihatskiy
|
f047e2236c
|
Merge branch 'master' into DRTVWR-522-maint
|
2021-02-01 22:14:56 +02:00 |
|
Ansariel
|
339c3c5df4
|
Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer
|
2021-01-18 18:55:37 +01:00 |
|
Ansariel
|
52b3bb404c
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-01-17 12:38:03 +01: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 |
|
Ansariel
|
5717f38411
|
FIRE-30611: "You" in transcript is underlined
|
2020-12-16 11:25:15 +01: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
|
c9e417c8a6
|
Merge viewer-neko
|
2017-11-30 01:19:29 +01:00 |
|
Mnikolenko Productengine
|
3d7dedff26
|
MAINT-8023 Viewer breaks URLs with internationalized domain names
|
2017-11-24 17:58:02 +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
|
bc22e58743
|
merge changes for 4.0.1-release
|
2016-01-15 16:55:04 -05:00 |
|
Oz Linden
|
c8726aba30
|
remove execute permission from many files that should not have it
|
2015-11-10 09:48:56 -05:00 |
|
Ansariel
|
8934c6eb1b
|
Merge Firestorm LGPL tip
|
2015-11-06 19:21:33 +01:00 |
|
Ansariel
|
500cbd17a5
|
FIRE-17187: Fix message with URL containing custom label ([url description]) shows description twice in console and fix wrong start and end indices for LLWString URL matches on the way
|
2015-11-02 11:02:00 +01:00 |
|
Ansariel
|
68739bc569
|
Merge Viewer-Bear
|
2015-10-27 01:31:15 +01:00 |
|
Ansariel
|
b1450b31a7
|
Undo FIRE-17104 / MAINT-5127 temporary fix for merge
|
2015-10-26 22:41:17 +01:00 |
|
Mnikolenko ProductEngine
|
966e9efd56
|
MAINT-5759 FIXED URL links in the UI with non-English characters, diacritics, don't get parsed correctly.
|
2015-10-21 12:59:20 +03:00 |
|
Ansariel
|
4a187aec4e
|
MAINT-5756: Unicode characters in online notifications get stripped
|
2015-10-16 11:28:53 +02:00 |
|
Ansariel
|
5b4f47bc65
|
FIRE-17104: Undo the whole MAINT-5127 stuff since it breaks more stuff than it helps
|
2015-10-17 00:59:07 +02:00 |
|
Ansariel
|
51bbec1f78
|
BUG-10491: Don't screw the NoLink SLURL match!
|
2015-10-16 11:26:02 +02: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 |
|
Ansariel
|
3273e637f9
|
FIRE-16642: Show invalid Hypergrid node URIs
|
2015-08-13 20:35:35 +02:00 |
|
Mnikolenko ProductEngine
|
d04a3b6d4e
|
MAINT-5127 FIXED Maps URLs copied from gcal inherit special characters that do odd things
|
2015-07-31 12:27:36 +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
|
078612e292
|
MAINT-5019 FIXED Additional cases
|
2015-07-14 04:39:20 +03:00 |
|
AndreyL ProductEngine
|
f153aa3daf
|
MAINT-5371 FIXED Undesired space added to SL and LL domains sent in chat
|
2015-07-08 06:15:27 +03:00 |
|
Oz Linden
|
949942c730
|
merge changes for 3.7.29-release
|
2015-06-08 16:33:02 -04:00 |
|
Ansariel
|
4ce6691cf8
|
Merge viewer-xp_tools
|
2015-06-25 11:57:17 +02: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 |
|
Oz Linden
|
bef5a95caf
|
minimal changes to compile on Xcode 6.2
|
2015-04-14 05:00:58 -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 |
|
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
|
3345d5f28d
|
Fail fixing: Only normalize trusted URLs that have been matched by LLUrlEntrySeconlifeURL
|
2015-02-25 20:24:20 +01:00 |