From 1809a3844561b4aa8423cc8b30f4aa8207a621b5 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Fri, 12 Mar 2010 11:52:24 +0100 Subject: Improved how SLURLs are handled on Linux. If Imprudence is not already running, clicking a SLURL in an external web browser will launch Imprudence. If it is already running, it will open the SLURL in the current instance. --- linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh b/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh index 422d4dd..2702d71 100755 --- a/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh +++ b/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh @@ -13,7 +13,9 @@ fi RUN_PATH=`dirname "$0" || echo .` cd "${RUN_PATH}" -#yeah, why just send a dbus message if we can spawn a whole new instance of the viewer just for sending the message? -#exec ./imprudence -url \'"${URL}"\' -# -exec dbus-send --type=method_call --dest=com.secondlife.ViewerAppAPIService /com/secondlife/ViewerAppAPI com.secondlife.ViewerAppAPI.GoSLURL string:"$1" +if [ `pidof do-not-directly-run-imprudence-bin` ]; then + exec dbus-send --type=method_call --dest=com.secondlife.ViewerAppAPIService /com/secondlife/ViewerAppAPI com.secondlife.ViewerAppAPI.GoSLURL string:"$1" +else + exec ./imprudence -url \'"${URL}"\' +fi + -- cgit v1.1