Ansariel
|
2ea6f51200
|
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm
|
2021-05-25 09:11:03 +02:00 |
|
Beq
|
ae0598e3f4
|
FIRE-30939 - remove legacy Inworldz URI support
|
2021-05-11 22:30:58 +01:00 |
|
Ansariel
|
94534f4c88
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-04-30 23:25:06 +02:00 |
|
Ansariel
|
7ab897baf0
|
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
|
2021-04-16 23:05:40 +02: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 |
|
Ansariel
|
567cb1eeff
|
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
|
2021-02-03 18:12:13 +01:00 |
|
Ansariel
|
2057fa9716
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-02-03 18:10:48 +01:00 |
|
Ansariel
|
7458601374
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-02-02 00:05:53 +01:00 |
|
Andrey Lihatskiy
|
cd831c4228
|
Merge branch 'master' into DRTVWR-516-maint
|
2021-02-01 22:11:04 +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 |
|
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 |
|
Ansariel
|
5717f38411
|
FIRE-30611: "You" in transcript is underlined
|
2020-12-16 11:25:15 +01: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 |
|
Ansariel
|
caf7f6c1d2
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-11-12 17:53:39 +01:00 |
|
Ansariel
|
daec926a54
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-11-12 17:02:25 +01:00 |
|
Ansariel
|
af2abe17cd
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-11-12 00:51:42 +01: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 |
|
Ansariel
|
14fb8f66f8
|
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-09-24 16:34:12 +02:00 |
|
Andrey Kleshchev
|
a5c8b1cbe2
|
SL-13729 Performance of LLUI and LLRender2D #2
|
2020-09-17 20:39:45 +03: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
|
0007ff2660
|
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-05-07 12:29:58 +02: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 |
|
Ansariel
|
fd4b8a7bb1
|
Merge Firestorm LGPL
|
2019-11-12 18:45:02 +01:00 |
|
AndreyL ProductEngine
|
84f3b2865f
|
Merged in lindenlab/viewer-release
|
2019-11-12 00:39:07 +02:00 |
|
Ansariel
|
d79b79fbe2
|
Merge viewer-ordered-shutdown
|
2019-10-19 03:16:10 +02:00 |
|
Ansariel
|
b1ae8def22
|
Merge Firestorm LGPL
|
2019-10-15 23:34:02 +02:00 |
|
Nicky
|
1d94fc7ce6
|
Change function signature of getAnonym to return std::string rather than reference and do not return "nobody" in case RLVa is disabled.
|
2019-10-09 22:32:19 +02:00 |
|
Ansariel
|
642d28245f
|
Merge Firestorm LGPL
|
2019-08-31 14:30:14 +02: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 |
|
andreykproductengine
|
c61d0f4297
|
DRTVWR-493 LLUI to LLParamSingleton
|
2019-08-10 15:31:03 +03:00 |
|
Ansariel
|
b69aff5a05
|
Merge viewer-neko
|
2019-07-05 18:04:36 +02: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 |
|
Ansariel
|
5c03d25022
|
Add tilia-inc.com as official LL URL
|
2019-07-04 23:44:51 +02:00 |
|
Liny
|
4e28024afd
|
Move URLs for firestorm jira over to newer URL as old one is being depricated.
|
2019-06-14 22:56:37 -07:00 |
|
Nicky
|
5a0cb2e7d0
|
Tentative fix for FIRE-23012. There's a feew more cases of boost:regex using \S but there had been no complaints about those so far, with that it seems reasonable to just update this occurence and see if there's any undesired side effects with using [^\s] rather than \S.
|
2019-03-03 02:36:07 +01:00 |
|
Ansariel
|
7e7984fcfd
|
Merge viewer-neko
|
2018-05-01 18:42:59 +02:00 |
|
Ansariel
|
abb602166f
|
FIRE-22483: Parse HTTPS map SLURL properly - another case
|
2018-04-10 00:06:16 +02:00 |
|
Ansariel
|
644bfee005
|
FIRE-22483: Parse HTTPS map SLURL properly
|
2018-04-09 23:59:51 +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
|
e8a24001aa
|
FIRE-21298: Emotes ignoring display name setting if using V5 style chat history
|
2017-06-23 15:55:03 +02:00 |
|
Ansariel
|
dcac0dce59
|
Merge viewer-bear
|
2017-05-07 13:11:50 +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 |
|
Ansariel
|
bbbb8765fc
|
Merge viewer-bear
|
2017-02-16 19:24:15 +01:00 |