aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorArmin Weatherwax2011-03-19 15:59:42 +0100
committerArmin Weatherwax2011-03-19 15:59:42 +0100
commitea974f39baed26a3c2de8ba00ada97e8a49d0468 (patch)
tree939d7b9df97fbcfa4e8900f1ce2f11e301731f8a /linden
parentpackage libz.so instead of libz.so.1 for linux32 (diff)
downloadmeta-impy-ea974f39baed26a3c2de8ba00ada97e8a49d0468.zip
meta-impy-ea974f39baed26a3c2de8ba00ada97e8a49d0468.tar.gz
meta-impy-ea974f39baed26a3c2de8ba00ada97e8a49d0468.tar.bz2
meta-impy-ea974f39baed26a3c2de8ba00ada97e8a49d0468.tar.xz
less misleading wording for linux script messages
Diffstat (limited to 'linden')
-rwxr-xr-xlinden/indra/newview/linux_tools/register_secondlifeprotocol.sh4
-rwxr-xr-xlinden/indra/newview/linux_tools/wrapper.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh b/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh
index 4ab96f9..338fc26 100755
--- a/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh
+++ b/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh
@@ -18,7 +18,7 @@ LLGCONFTOOL2=gconftool-2
18if which ${LLGCONFTOOL2} >/dev/null; then 18if which ${LLGCONFTOOL2} >/dev/null; then
19 (${LLGCONFTOOL2} -s -t string /desktop/gnome/url-handlers/secondlife/command "${HANDLER} \"%s\"" && ${LLGCONFTOOL2} -s -t bool /desktop/gnome/url-handlers/secondlife/enabled true) || echo Warning: Did not register secondlife:// handler with GNOME: ${LLGCONFTOOL2} failed. 19 (${LLGCONFTOOL2} -s -t string /desktop/gnome/url-handlers/secondlife/command "${HANDLER} \"%s\"" && ${LLGCONFTOOL2} -s -t bool /desktop/gnome/url-handlers/secondlife/enabled true) || echo Warning: Did not register secondlife:// handler with GNOME: ${LLGCONFTOOL2} failed.
20else 20else
21 echo Warning: Did not register secondlife:// handler with GNOME: ${LLGCONFTOOL2} not found. 21 echo Info: Did not register secondlife:// handler with GNOME: ${LLGCONFTOOL2} not found. You can safely ignore this if you are not using GNOME.
22fi 22fi
23 23
24# Register handler for KDE-aware apps 24# Register handler for KDE-aware apps
@@ -42,5 +42,5 @@ makedir=false
42deleting=false 42deleting=false
43EOF 43EOF
44else 44else
45 echo Warning: Did not register secondlife:// handler with KDE: Directory $LLKDEPROTDIR does not exist. 45 echo Info: Did not register secondlife:// handler with KDE: Directory $LLKDEPROTDIR does not exist. You can safely ignore this if you are not using KDE.
46fi 46fi
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index a43ebd5..f6ce272 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -126,7 +126,7 @@ if [ -n "$LL_RUN_ERR" ]; then
126 LL_RUN_ERR_MSG="" 126 LL_RUN_ERR_MSG=""
127 if [ "$LL_RUN_ERR" = "runerr" ]; then 127 if [ "$LL_RUN_ERR" = "runerr" ]; then
128 # generic error running the binary 128 # generic error running the binary
129 echo '*** Bad shutdown. ***' 129 echo 'unexpected shutdown'
130 130
131 131
132 fi 132 fi