From 9d26172d74b6de638339f8f6336f5087c91c8831 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Sat, 6 Nov 2010 20:50:03 +0100
Subject: IMP-688: ERROR: getString: Invalid string control nick01

Don't look for the old variable names, "nick0*", but for the new ones.
---
 linden/doc/contributions.txt           | 1 +
 linden/indra/newview/llfloaterchat.cpp | 2 +-
 linden/indra/newview/llprefscolors.cpp | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index a54424c..cd6544a 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -89,6 +89,7 @@ Aleric Inglewood
 	IMP-664
 	IMP-667
 	IMP-670
+	IMP-688
 Alissa Sabre
 	VWR-81
 	VWR-83
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index a453c39..e9ea14b 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -482,7 +482,7 @@ BOOL LLFloaterChat::isOwnNameInText(const std::string &text_line)
 	for (int i=1; i<=3; i++)
 	{
 		std::stringstream key;
-		key << "nick0" << i;
+		key << "HighlightNickname0" << i;
 		std::string nick = gSavedSettings.getString(key.str());
 		if (! nick.empty())
 		{
diff --git a/linden/indra/newview/llprefscolors.cpp b/linden/indra/newview/llprefscolors.cpp
index 36e98a4..b0bc345 100644
--- a/linden/indra/newview/llprefscolors.cpp
+++ b/linden/indra/newview/llprefscolors.cpp
@@ -71,6 +71,7 @@ BOOL LLPrefsColors::postBuild()
 	updateSelfCheck();
 	updateFriendsCheck();
 	
+	// All three of these settings must exist, they are read by LLFloaterChat::isOwnNameInText.
 	childSetValue("nick01", gSavedSettings.getString("HighlightNickname01"));
 	childSetValue("nick02", gSavedSettings.getString("HighlightNickname02"));
 	childSetValue("nick03", gSavedSettings.getString("HighlightNickname03"));
-- 
cgit v1.1


From 4f471ff939d1ad9b62280f11c5cf597cfc2c8596 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Mon, 8 Nov 2010 00:58:07 -0600
Subject: Transferred the new linux32 gtk-etc package to our server.

---
 linden/install.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linden/install.xml b/linden/install.xml
index 95c7cec..88b6ef3 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -702,7 +702,7 @@ cairo: Copyright © 2002 University of Southern California, Copyright © 2005 Re
             <key>md5sum</key>
             <string>349ee367e0ac1e878b24b66e449c6ff8</string>
             <key>url</key>
-			<uri>http://github.com/downloads/AlericInglewood/imprudence/gtk-etc-linux-20101106.1.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/gtk-etc-linux-20101106.1.tar.bz2</uri>
           </map>
           <key>linux64</key>
           <map>
-- 
cgit v1.1


From 6ae81eabfcaba2a989b5a0da5eac71ec7a9a39bc Mon Sep 17 00:00:00 2001
From: Robin Cornelius
Date: Sun, 7 Nov 2010 20:28:12 +0000
Subject: Correctly stage libhunspell.dll in viewer_manifest.py

---
 linden/indra/newview/viewer_manifest.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 41495ca..b1bb250 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -246,7 +246,9 @@ class WindowsManifest(ViewerManifest):
         #self.path("fmod.dll")
         
         # For spellchecking
-        self.path("libhunspell.dll")
+        if self.prefix(src=self.args['configuration'], dst=""):
+            self.path("libhunspell.dll")
+            self.end_prefix()
 
         # For textures
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
-- 
cgit v1.1


From 257a706943a31507388c3a34fa0a744b409b1a4f Mon Sep 17 00:00:00 2001
From: Robin Cornelius
Date: Sun, 7 Nov 2010 20:29:53 +0000
Subject: As we currently do not build the gstreamer plugin for windows, do not
 try to stage it in viewer_manifest.py

---
 linden/indra/newview/viewer_manifest.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index b1bb250..6dcd977 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -270,12 +270,7 @@ class WindowsManifest(ViewerManifest):
         if self.prefix(src='../media_plugins/webkit/%s' % self.args['configuration'], dst="llplugin"):
             self.path("media_plugin_webkit.dll")
             self.end_prefix()
-            
-        # Media plugins - Gstreamer
-        if self.prefix(src='../media_plugins/gstreamer/%s' % self.args['configuration'], dst="llplugin"):
-            self.path("media_plugin_gstreamer010.dll", "media_plugin_gstreamer.dll")
-            self.end_prefix()
-            
+ 
         # For WebKit/Qt plugin runtimes
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"):
             self.path("libeay32.dll")
-- 
cgit v1.1