From f63e3abf79e96943c2c7542fcb9e2945b0912e34 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Fri, 18 Mar 2011 11:56:08 +0100
Subject: Fix Bug #799 german floater_pay_object.xml broken

---
 linden/indra/newview/skins/default/xui/de/floater_pay_object.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
index 07dee37..fc7c204 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="[PAY TYPE] [FIRST] [LAST>
+<floater name="Give Money" title="[PAY TYPE] [FIRST] [LAST]">
 
 	<string name="pay group">
 		Gruppe bezahlen:
-- 
cgit v1.1


From 16457f139853b280043e727f67306673e778e8b6 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Fri, 18 Mar 2011 16:06:39 +0100
Subject: fix currency in the german status bar button missing

---
 linden/indra/newview/skins/default/xui/de/panel_status_bar.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml
index 565e6b8..6c2da13 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml
@@ -6,7 +6,7 @@
 	<text length="1" name="BalanceText" tool_tip="Kontostand" type="string">
 		Wird geladen...
 	</text>
-	<button label="" label_selected="" name="buycurrency" tool_tip="Geld kaufen"/>
+	<button label="[CURRENCY]" label_selected="" name="buycurrency" tool_tip="Geld kaufen"/>
 	<text length="12" name="TimeText" tool_tip="Aktuelle Zeit (Pazifik)" type="string">
 		12:00
 	</text>
-- 
cgit v1.1


From f8e5faa3079218704cfb793917e96a0a7a9ef8b1 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Fri, 18 Mar 2011 16:55:28 +0100
Subject: only use vbo if available

---
 linden/indra/newview/llviewerwindow.cpp | 2 +-
 linden/indra/newview/pipeline.cpp       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index b4ef3ff..269a3d0 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -1309,7 +1309,7 @@ LLViewerWindow::LLViewerWindow(
 	{
 		gSavedSettings.setBOOL("RenderVBOEnable", FALSE);
 	}
-	LLVertexBuffer::initClass(gSavedSettings.getBOOL("RenderVBOEnable"));
+	LLVertexBuffer::initClass(gSavedSettings.getBOOL("RenderVBOEnable") && gGLManager.mHasVertexBufferObject);
 
 	if (LLFeatureManager::getInstance()->isSafe()
 		|| (gSavedSettings.getS32("LastFeatureVersion") != LLFeatureManager::getInstance()->getVersion())
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 36ffb05..5458af5 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -4934,7 +4934,7 @@ void LLPipeline::setUseVBO(BOOL use_vbo)
 		}
 		
 		resetVertexBuffers();
-		LLVertexBuffer::initClass(use_vbo);
+		LLVertexBuffer::initClass(use_vbo && gGLManager.mHasVertexBufferObject);
 	}
 }
 
-- 
cgit v1.1


From 901acaf13758b3faec599354f4e8b44ad7f0469b Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Sat, 19 Mar 2011 15:42:25 +0100
Subject: package libz.so instead of libz.so.1 for linux32

---
 linden/indra/newview/viewer_manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 3651bea..8225b4c 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -1018,7 +1018,7 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libELFIO.so")
             self.path("libopenjpeg.so.2")
             self.path("libxml2.so.2")
-            self.path("libz.so.1")
+            self.path("libz.so.1","libz.so")
 
             # OpenAL
             self.path("libopenal.so.1.12.854", "libopenal.so.1")
-- 
cgit v1.1


From ea974f39baed26a3c2de8ba00ada97e8a49d0468 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Sat, 19 Mar 2011 15:59:42 +0100
Subject: less misleading wording for linux script messages

---
 linden/indra/newview/linux_tools/register_secondlifeprotocol.sh | 4 ++--
 linden/indra/newview/linux_tools/wrapper.sh                     | 2 +-
 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
 if which ${LLGCONFTOOL2} >/dev/null; then
     (${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.
 else
-    echo Warning: Did not register secondlife:// handler with GNOME: ${LLGCONFTOOL2} not found.
+    echo Info: Did not register secondlife:// handler with GNOME: ${LLGCONFTOOL2} not found. You can safely ignore this if you are not using GNOME.
 fi
 
 # Register handler for KDE-aware apps
@@ -42,5 +42,5 @@ makedir=false
 deleting=false
 EOF
 else
-    echo Warning: Did not register secondlife:// handler with KDE: Directory $LLKDEPROTDIR does not exist.
+    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.
 fi
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
 	LL_RUN_ERR_MSG=""
 	if [ "$LL_RUN_ERR" = "runerr" ]; then
 		# generic error running the binary
-		echo '*** Bad shutdown. ***'
+		echo 'unexpected shutdown'
 
 
 	fi
-- 
cgit v1.1