From 4e2423c77f30a8e9ad5f18e31c8f5c43076d5790 Mon Sep 17 00:00:00 2001
From: JennaHuntsman <jenna.salem.sf@gmail.com>
Date: Wed, 27 Jul 2022 16:09:32 -0400
Subject: [PATCH] Revert "Add support for OpenSim hop:// protocol"
This reverts commit 8c63fac141824e23dba5317d0b2bb387a1300424
---
indra/newview/linux_tools/refresh_desktop_app_entry.sh | 2 +-
indra/newview/linux_tools/register_secondlifeprotocol.sh | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/indra/newview/linux_tools/refresh_desktop_app_entry.sh b/indra/newview/linux_tools/refresh_desktop_app_entry.sh
index 2c8d3fe2971..88ec152fa9e 100755
--- a/indra/newview/linux_tools/refresh_desktop_app_entry.sh
+++ b/indra/newview/linux_tools/refresh_desktop_app_entry.sh
@@ -45,7 +45,7 @@ PrefersNonDefaultGPU=false
[Desktop Action AssociateMIME]
Exec=${installation_prefix}/etc/register_secondlifeprotocol.sh
Name=Associate SLURLs
-Comment=Set this viewer as the default handler for secondlife:// and hop:// links.
+Comment=Set this viewer as the default handler for secondlife:// links.
desktopfile
#The above adds some options when the shortcut is right-clicked, to launch on the default (usually integrated) GPU, and to force MIME type association.
diff --git a/indra/newview/linux_tools/register_secondlifeprotocol.sh b/indra/newview/linux_tools/register_secondlifeprotocol.sh
index d38cc297049..06dd1278174 100755
--- a/indra/newview/linux_tools/register_secondlifeprotocol.sh
+++ b/indra/newview/linux_tools/register_secondlifeprotocol.sh
@@ -29,14 +29,14 @@ if command -v xdg-mime query default x-scheme-handler/secondlife >/dev/null 2>&1
cat >"${handlerpath}" <<EOFnew || print "Warning: Did not register secondlife:// handler with xdg-mime: Could not write $newhandler"s
[Desktop Entry]
Version=1.4
-Name="Second Life and OpenSim URL handler"
-Comment="secondlife:// and hop:// URL handler"
+Name="Second Life URL handler"
+Comment="secondlife:// URL handler"
Type=Application
Exec=$desired_handler %u
Terminal=false
StartupNotify=true
NoDisplay=true
-MimeType=x-scheme-handler/secondlife;x-scheme-handler/hop;x-scheme-handler/x-grid-info;x-scheme-handler/x-grid-location-info;
+MimeType=x-scheme-handler/secondlife
EOFnew
# TODO: use absolute path for the desktop file
@@ -55,7 +55,7 @@ EOFnew
print "SLURL Handler has not changed, leaving as-is."
fi
fi
- xdg-mime default "${newhandler}" x-scheme-handler/secondlife x-scheme-handler/hop x-scheme-handler/x-grid-info x-scheme-handler/x-grid-location-info
+ xdg-mime default "${newhandler}" x-scheme-handler/secondlife
if command -v update-desktop-database >/dev/null 2>&1; then
update-desktop-database "${localappdir}"
print "Registered ${desired_handler} as secondlife:// protocol handler with xdg-mime."
--
GitLab