livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
68,590 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

314 Commits (b157ab47c00f9f5bc3bd2533f32cd12a4a7c2efd)

Author SHA1 Message Date
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 7a845ee23b Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-522 2021-09-20 12:59:14 +02:00
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
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 4c4dfb682a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-07-21 13:35:31 +02:00
Ansariel 9718a38e9a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-07-21 03:07:48 +02: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
Ansariel f8d1834036 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-06-09 08:48:27 +02: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 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 7f91fa0b40 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-05-02 13:15:10 +02:00
Ansariel 94534f4c88 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-04-30 23:25:06 +02: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
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 23693c23a7 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-03 23:50:45 +01: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 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
Ansariel 339c3c5df4 Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer 2021-01-18 18:55:37 +01: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 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
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
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
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