Commit Graph

46 Commits (2a6b5cbde5ec3c3603b9cd3aecd5e6eac06eb1fc)

Author SHA1 Message Date
Ansariel 6491cb0307 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202506 2025-08-14 20:08:01 +02:00
Ansariel 97a56ba909 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llchatitemscontainerctrl.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewermenu.h
2025-08-08 19:31:28 +02:00
Andrey Kleshchev 7f276f81ed #4474 Zoom in to Object From Chat
Url based handler for compact chat
Normal handling for expanded chat.
2025-08-08 16:05:33 +03:00
Ansariel 0871a8ed4a Merge branch 'release/2025.06' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llui/llurlentry.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llvoavatar.cpp
2025-08-06 19:07:19 +02:00
Andrey Kleshchev ce9d66cdd1 Merge branch develop into 2025.06
# Conflicts:
#	indra/newview/llvoavatar.cpp
2025-08-06 16:05:19 +03:00
Ansariel a4e8af0dce Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	.github/pull_request_template.md
#	CONTRIBUTING.md
#	indra/newview/CMakeLists.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterimagepreview.cpp
#	indra/newview/llfloatersettingsdebug.cpp
#	indra/newview/llfloatersettingsdebug.h
#	indra/newview/llstatusbar.cpp
#	indra/newview/llstatusbar.h
#	indra/newview/res/viewerRes.rc
#	indra/newview/skins/default/xui/de/panel_login_first.xml
#	indra/newview/skins/default/xui/en/notifications.xml
#	indra/newview/skins/default/xui/en/panel_login_first.xml
#	indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
#	indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
#	indra/newview/skins/default/xui/en/panel_status_bar.xml
#	indra/newview/skins/default/xui/es/panel_login_first.xml
#	indra/newview/skins/default/xui/fr/panel_login_first.xml
#	indra/newview/skins/default/xui/it/panel_login_first.xml
#	indra/newview/skins/default/xui/ja/panel_login_first.xml
#	indra/newview/skins/default/xui/pl/panel_login_first.xml
#	indra/newview/skins/default/xui/pt/panel_login_first.xml
#	indra/newview/skins/default/xui/ru/panel_login_first.xml
#	indra/newview/skins/default/xui/tr/panel_login_first.xml
#	indra/newview/skins/default/xui/zh/panel_login_first.xml
#	indra/newview/viewer_manifest.py
2025-07-30 10:52:39 +02: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
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 6638d1d367 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-01-26 12:31:20 +01:00
Andrey Kleshchev e129986a49 SL-3007 Ability to report abuse from chat 2022-01-24 23:37:21 +02:00
Ansariel 71f1707b99 Merge viewer-lion 2016-05-23 17:41:19 +02:00
andreykproductengine efa716b5fc MAINT-2129 "Block" button doesn't become disabled 2016-05-18 19:29:31 +03:00
Ansariel a0188a5358 Merge Firestorm LGPL 2016-05-09 12:41:24 +02:00
Oz Linden 950c41d184 merge 4.0.4-release and MAINT-5974 2016-05-06 10:28:42 -04:00
Ansariel 1bba3dfbe4 Merge viewer-bear 2016-03-17 21:14:49 +01:00
andreykproductengine 230fc28d8a MAINT-6097 FIXED On required update, clicking link to release notes opens browser behind menu 2016-03-11 20:16:03 +02:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden 5822fb00b6 merge DRTVWR-398 build cleanup fixes 2016-03-07 12:41:11 -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 5524d38dff Merge viewer-quickgraphics 2015-10-03 16:38:26 +02:00
Ansariel 21a36e2c5b MAINT-4677: Unexpected behaviour when blocking objects with a / in their name when using compact chat view 2014-11-18 12:15:30 +01:00
Ansariel b7f03802ac FIRE-14987 / BUG-7784 / MAINT-4677: Cannot mute objects with slashes in their name via V1 chat history 2014-11-18 11:38:12 +01:00
Tank_Master 3d1ac7c0ec Merge LL 3.7.3 (Viewer-Bear fixes) 2014-03-17 14:14:15 -07:00
simon cfadbe631f Revert earlier back-out for MAINT-535 ... it's back in 2014-01-10 13:15:19 -08:00
simon f291995dac Revert changes made for MAINT-535 to test in a release cohort. 2014-01-07 15:18:29 -08:00
Mnikolenko ProductEngine 28339afa15 MAINT-535 'trust model' is added for secondlife:// URLs in wiki style links. Chat history is marked as untrusted source now. 2013-10-22 12:47:16 +03:00
mberezhnoy 7d08262954 build fix 2013-06-22 02:49:25 +03:00
mberezhnoy 2b8beeeff1 CHUI-809 (Right-click menu on user name in compat chat mode doesn't have "IM")
Fixed "Add friend" option always being greyed out, add ability to block object via context menu in compact chat mode.
2013-06-20 12:45:22 +03:00
mberezhnoy 882ab04ef3 CHUI-809 (Right-click menu on user name in compat chat mode doesn't have "IM")
Added callback for friendship checking
2013-06-13 20:21:24 +03:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Mnikolenko ProductEngine d81226f170 CHUI-809 FIXED Changes in menu items to make them consistent. Do not start IM if selected person is self. 2013-03-12 15:38:10 +02:00
Mnikolenko ProductEngine 477920b138 CHUI-809 FIXED "Start IM" menu item is added 2013-03-05 15:40:31 +02:00
Tank_Master 5a8d94c50f Merge LL 3.6.4 pass 1 2013-08-28 00:10:39 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Tank_Master 14001c54df Gastly CHUI merge pass 1, don't count on anything to work. 2013-06-26 12:14:54 -07:00
Ansariel 80be39c63a Added new Firestorm specific SLurl command and command handler with some basic functionality:
* Zoom to avatar
* Teleport to avatar
* Track avatar
all from the SLurl context menu in chat and contact list
2012-08-12 19:00:20 +02:00
Richard Linden a507fc259b finished removing remnants of media browser 2011-11-07 15:04:53 -08:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Eugene Mutavchi 647327d0ec Fixed normal bug EXT-6907 ('Show residents profile' menu opens inspector instead of profile) - added 'Url.ShowProfile' action.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/282/

--HG--
branch : product-engine
2010-04-21 20:23:55 +03:00
Lynx Linden 00e56b0907 DEV-41358 DEV-41361: Added support for secondlife:///app/worldmap
SLurls to the LLUrlRegistry. These are now displayed with the more
human-readable label of "Show Map for XXXX" and sport a context menu
with various operations.

I also added "Show on Map" options to the context menus for other
location-based SLurls.

I also internationalized the text for "Teleport to" and the new "Show
Map for" strings.
2009-11-03 19:08:11 +00:00
Adam Moss feabeb4965 DEV-35039 Viewer 2.0 Help System - Viewer Development
svn merge -r134800:134805 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer2help-3
2009-09-30 17:46:31 +00:00
Martin Reddy 47abd55908 EXT-944 EXT-1026: reverting my previous fix for these crashes.
This didn't work on Windows because wchar_t is 2 bytes on that
platform, not 4 bytes (whereas llwchar is 4 bytes everywhere).
Boost's regex methods need to work on wchar_t, but I believe
that using a UTF-16 string would still be prone to crashing on
Windows as UTF-16 is still a variable-length encoding. Besides,
trying to compile a UTF-16 solution generates weird link errors.

Instead, I'm going to fix this problem a different way. And
I'm starting by reverting the previous attempt. Thanks Win32.
2009-09-23 13:57:06 +00:00
Martin Reddy 12762053e5 EXT-944 EXT-1026: converted the LLUrlRegistry::findUrl() method to
work on an LLWString instead of a std::string, so that we don't have
to worry about character offsets for variable-length-encoded UTF-8
strings.

This was causing crashes whenever we would try to show a textbox with
a URL and foreign characters (> 1 byte chars). Damn, I suck!
2009-09-22 18:00:16 +00:00
Martin Reddy 330840af7c Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into
Viewer 2.0 (viewer-2.0.0-3). This provides support for clickable Urls
in text editors and textboxes, with right-click context menus,
tooltips, and alternate link labels. This includes alert boxes, the
login progress window, local chat and IM interfaces, etc. As well as
context menus for avatars and groups in list widgets. Includes fixes
for the following individual JIRAs:

DEV-8763 VWR-10636: Hyperlinks in alert dialogs should be selectable (clickable)!
DEV-38829 EXT-742: Remove LLLink class
DEV-35459 VWR-14679: SLURLs and teleport Links not parsed properly
DEV-19842 VWR-8773: Closing parenthesis ")" breaks urls
DEV-21577 VWR-9405: In-world SLURLs containing "(" or ")" are not treated as a hyperlink in chat
DEV-37652 SEC-435: Object Chat/IMs are untraceable (VWR-2388) Fix has left flaw
DEV-10353: URLs in chat log terminated incorrectly when newline in chat
DEV-2925: In chat history, use a teleport hyperlink as source name for object IMs
DEV-36192: Need a way to copy Avatar names and Group names
DEV-2926: Allow viewer hyperlinks to have different text than the actual url
DEV-27253: Add easy way to copy URLs from viewer chat
DEV-38274: Make About Second Life window use new Url hyperlinking features
DEV-39076: No url support in Text Editors
DEV-7476 VWR-2172: Add hyperlinks to chat console for easier access
DEV-7475: Add hyperlinks to notecards!
DEV-35375 EXT-128: HTTPS urls aren't loaded in the internal browser by click

Master JIRA issues: DEV-32819, DEV-323820, DEV-7474

Testing performed against QAR-1789

svn merge -r 131623:131889 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-slurl-3
svn merge -r 131978:132515 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-slurl-3
2009-09-04 12:11:27 +00:00