Andrey Kleshchev
|
ce9d66cdd1
|
Merge branch develop into 2025.06
# Conflicts:
# indra/newview/llvoavatar.cpp
|
2025-08-06 16:05:19 +03:00 |
|
Maxim Nikolenko
|
514b658fde
|
#4385 show agent name next to @ mention url in chat logs
|
2025-07-29 18:47:44 +03:00 |
|
Maxim Nikolenko
|
590ad6747f
|
#4047 fix 'Show on Map' command for parcel URI links
|
2025-07-17 23:51:42 +03:00 |
|
Maxim Nikolenko
|
50108bf0b7
|
#4011 Add conversation list highlight for chat mention
|
2025-05-07 18:59:00 +03:00 |
|
Maxim Nikolenko
|
929c9b2dd0
|
#4009 Add color settings for chat mentions to Preferences
|
2025-05-05 15:28:51 +03:00 |
|
Mnikolenko Productengine
|
1eb34b43fb
|
#3758 clean up: move EUnderlineLink
|
2025-04-25 20:22:33 +03:00 |
|
Mnikolenko Productengine
|
17561e2ad1
|
#3758 show mention name in bubble chat
|
2025-04-23 21:04:47 +03:00 |
|
Mnikolenko Productengine
|
3e46d707a2
|
#3758 initial chat mention support
|
2025-04-18 19:59:17 +03:00 |
|
Mnikolenko Productengine
|
90c7684112
|
#3758 add support for highlighted segments
|
2025-04-18 19:59:09 +03:00 |
|
Andrey Kleshchev
|
ecfe76ac12
|
vp#404 Improve URL filter
|
2025-03-21 22:52:13 +02:00 |
|
Ansariel Hiller
|
1a65e29432
|
Fix names in group chat sometimes showing as "Loading..." and never resolve (#2547)
|
2024-09-12 09:18:45 +03:00 |
|
Rye Mutt
|
3e322df4fb
|
Replace liburiparser with boost::url
|
2024-07-29 13:33:12 +03: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
|
e2e37cced8
|
Fix line endlings
|
2024-05-22 22:40:26 +03:00 |
|
Ansariel
|
1b67dd855c
|
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/lllistener_fmodstudio.cpp
# indra/llaudio/lllistener_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llimpanel.cpp
# indra/newview/llimpanel.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
# indra/test/test.cpp
|
2024-05-22 19:04:52 +02:00 |
|
Alexander Gavriliuk
|
f9473e8afc
|
secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries
|
2024-05-07 10:18:51 +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
|
d0102af56d
|
Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
# Conflicts:
# indra/llcommon/llapp.cpp
# indra/llcommon/llapp.h
# indra/llimage/llimageworker.cpp
# indra/llui/llcontainerview.cpp
# indra/llui/llcontainerview.h
# indra/llui/llkeywords.cpp
# indra/llui/lltabcontainer.cpp
# indra/llui/lltextbase.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfavoritesbar.h
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llhudnametag.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelvoicedevicesettings.h
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewscript.h
# indra/newview/llselectmgr.cpp
# indra/newview/lltranslate.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewermessage.cpp
|
2024-04-11 21:59:38 +02: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
|
a5261a5fa8
|
Convert BOOL to bool in llui
|
2024-02-21 03:00:25 +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 |
|
Maxim Nikolenko
|
d5257abdb1
|
SL-18734 certain links are not displayed appropriately
|
2022-12-02 00:45:34 +02: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 |
|
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 |
|
Mnikolenko Productengine
|
8178e51a74
|
SL-15690 FIXED Wrong URI determination
|
2021-07-29 19:06:13 +03: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 |
|
Andrey Kleshchev
|
b6ac642db2
|
SL-15243 Unicode URL validation
|
2021-06-03 19:50:08 +03: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Andrey Kleshchev
|
a5c8b1cbe2
|
SL-13729 Performance of LLUI and LLRender2D #2
|
2020-09-17 20:39:45 +03: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 |
|
Mnikolenko Productengine
|
9608b6dcac
|
SL-13433 Viewer should recognizes ipv6 links
|
2020-06-11 17:41:59 +03: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 |
|
AndreyL ProductEngine
|
84f3b2865f
|
Merged in lindenlab/viewer-release
|
2019-11-12 00:39:07 +02:00 |
|
andreykproductengine
|
c61d0f4297
|
DRTVWR-493 LLUI to LLParamSingleton
|
2019-08-10 15:31:03 +03: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 |
|
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 |
|
Mnikolenko Productengine
|
3d7dedff26
|
MAINT-8023 Viewer breaks URLs with internationalized domain names
|
2017-11-24 17:58:02 +02:00 |