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

134 Commits (387f74e2a9858dfd8a2162c0dea42e938b3920f4)

Author SHA1 Message Date
Ansariel 9df4d7ba96 Merge branch 'release/2025.04' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/cmake/Python.cmake
#	indra/newview/llimview.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/skins/default/colors.xml
 2025-05-08 14:49:31 +02:00
Maxim Nikolenko 50108bf0b7
#4011 Add conversation list highlight for chat mention 2025-05-07 18:59:00 +03:00
Ansariel cf2f48de06 Merge branch 'release/2025.04' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llui/llflatlistview.cpp
#	indra/llui/llstyle.cpp
#	indra/llui/llstyle.h
#	indra/llui/lltextbase.cpp
#	indra/llui/llurlmatch.cpp
#	indra/llui/llurlmatch.h
#	indra/llui/llurlregistry.cpp
#	indra/llui/llurlregistry.h
#	indra/newview/llavatarlist.cpp
#	indra/newview/llavatarlist.h
#	indra/newview/llavatarlistitem.cpp
#	indra/newview/llavatarlistitem.h
#	indra/newview/llfloaternewfeaturenotification.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llviewerchat.cpp
#	indra/newview/llviewerfloaterreg.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/skins/default/colors.xml
 2025-04-26 00:31:04 +02:00
Mnikolenko Productengine 17561e2ad1 #3758 show mention name in bubble chat 2025-04-23 21:04:47 +03:00
Mnikolenko Productengine 90c7684112 #3758 add support for highlighted segments 2025-04-18 19:59:09 +03:00
Ansariel 02680c6a8f Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/Boost.cmake
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/llaudio/llaudiodecodemgr.cpp
#	indra/llxml/llxmltree.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterworldmap.cpp
#	indra/newview/llfloaterworldmap.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llinventorygallerymenu.cpp
#	indra/newview/llpanelgroup.cpp
#	indra/newview/llpanelgroup.h
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/viewer_manifest.py
 2024-07-30 12:32:41 +02:00
Rye Mutt 3e322df4fb Replace liburiparser with boost::url 2024-07-29 13:33:12 +03:00
Ansariel a17fd2352a Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llcharacter/llkeyframemotion.cpp
#	indra/llcharacter/llmotioncontroller.cpp
#	indra/llcrashlogger/llcrashlogger.cpp
#	indra/llimage/llimagetga.cpp
#	indra/llmessage/llregionflags.h
#	indra/llprimitive/lldaeloader.cpp
#	indra/llprimitive/llmodel.cpp
#	indra/llrender/llrendertarget.cpp
#	indra/llui/llconsole.cpp
#	indra/llui/llkeywords.cpp
#	indra/llui/llscrolllistctrl.cpp
#	indra/llui/lltextbase.cpp
#	indra/llui/lltexteditor.cpp
#	indra/llui/llurlentry.cpp
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterworldmap.cpp
#	indra/newview/llgiveinventory.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llpanelpeople.cpp
#	indra/newview/llpanelpermissions.cpp
#	indra/newview/llpanelteleporthistory.cpp
#	indra/newview/llvocache.cpp
 2024-06-09 16:11:24 +02:00
Ansariel b42f9d836b Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings 2024-06-01 15:49:26 +02:00
Ansariel 5f1a19af72 Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 
# Conflicts:
#	autobuild.xml
#	indra/linux_crash_logger/llcrashloggerlinux.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llcallbacklist.cpp
#	indra/newview/llimpanel.h
 2024-05-01 12:30:57 +02:00
Andrey Lihatskiy 1b68f71348 #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
Ansariel c63b3eca4c Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llui/llurlregistry.cpp
#	indra/newview/llcontrolavatar.cpp
 2024-03-01 21:00:56 +01:00
Andrey Kleshchev ae7b318e7f viewer#875 Crash at uri normalization 
Note that crash happened when setting LLProgressView::setMessage
 2024-02-23 19:18:23 +02:00
Ansariel 63151d5c6d Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/llurlentry.h
#	indra/llui/llurlregistry.cpp
#	indra/llui/llurlregistry.h
#	indra/newview/llviewerinventory.cpp
#	indra/newview/llvoavatarself.h
 2023-07-18 00:16:15 +02:00
Andrey Kleshchev 4c89ad5586 SL-19306 A method of displaying user-customized keybindings in user-visible text 2023-07-17 15:46:18 +03:00
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