aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh
diff options
context:
space:
mode:
authorArmin Weatherwax2010-03-12 11:52:24 +0100
committerJacek Antonelli2010-03-13 01:29:23 -0600
commit1809a3844561b4aa8423cc8b30f4aa8207a621b5 (patch)
treec669081f73a8ffcc88e502b35bad424b1dd83c5b /linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh
parentSet correct paths when running in 32bit mode on 64bit Linux. (diff)
downloadmeta-impy-1809a3844561b4aa8423cc8b30f4aa8207a621b5.zip
meta-impy-1809a3844561b4aa8423cc8b30f4aa8207a621b5.tar.gz
meta-impy-1809a3844561b4aa8423cc8b30f4aa8207a621b5.tar.bz2
meta-impy-1809a3844561b4aa8423cc8b30f4aa8207a621b5.tar.xz
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.
Diffstat (limited to '')
-rwxr-xr-xlinden/indra/newview/linux_tools/handle_secondlifeprotocol.sh10
1 files 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
13RUN_PATH=`dirname "$0" || echo .` 13RUN_PATH=`dirname "$0" || echo .`
14cd "${RUN_PATH}" 14cd "${RUN_PATH}"
15 15
16#yeah, why just send a dbus message if we can spawn a whole new instance of the viewer just for sending the message? 16if [ `pidof do-not-directly-run-imprudence-bin` ]; then
17#exec ./imprudence -url \'"${URL}"\' 17 exec dbus-send --type=method_call --dest=com.secondlife.ViewerAppAPIService /com/secondlife/ViewerAppAPI com.secondlife.ViewerAppAPI.GoSLURL string:"$1"
18#</sarcasm> 18else
19exec dbus-send --type=method_call --dest=com.secondlife.ViewerAppAPIService /com/secondlife/ViewerAppAPI com.secondlife.ViewerAppAPI.GoSLURL string:"$1" 19 exec ./imprudence -url \'"${URL}"\'
20fi
21