From 3e5bd4e13b7519e699704b93f02e3f28bb63be58 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sun, 9 Dec 2012 04:25:01 +0100
Subject: [PATCH] Linux build fixes

---
 indra/newview/llfloateravatarlist.cpp | 10 +++++-----
 indra/newview/llwebprofile.cpp        |  5 -----
 install.xml                           |  4 ++--
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp
index 8b02f06d9..015bb165e 100644
--- a/indra/newview/llfloateravatarlist.cpp
+++ b/indra/newview/llfloateravatarlist.cpp
@@ -320,10 +320,10 @@ void LLFloaterAvatarList::onClose(bool app_quitting)
 	}
 }
 
-void cmd_profile(const LLAvatarListEntry* entry);
-void cmd_toggle_mark(LLAvatarListEntry* entry);
-void cmd_ar(const LLAvatarListEntry* entry);
-void cmd_teleport(const LLAvatarListEntry* entry);
+static void cmd_profile(const LLAvatarListEntry* entry);
+static void cmd_toggle_mark(LLAvatarListEntry* entry);
+static void cmd_ar(const LLAvatarListEntry* entry);
+static void cmd_teleport(const LLAvatarListEntry* entry);
 BOOL LLFloaterAvatarList::postBuild()
 {
 	// Set callbacks
@@ -1447,7 +1447,7 @@ void LLFloaterAvatarList::doCommand(avlist_command_t func, bool single/*=false*/
 std::string LLFloaterAvatarList::getSelectedNames(const std::string& separator)
 {
 	std::string ret;
-	doCommand(boost::bind(&cmd_append_names,_1,ref(ret),separator));
+	doCommand(boost::bind(&cmd_append_names,_1,boost::ref(ret),separator));
 	return ret;
 }
 
diff --git a/indra/newview/llwebprofile.cpp b/indra/newview/llwebprofile.cpp
index 31751fddf..d1c769285 100644
--- a/indra/newview/llwebprofile.cpp
+++ b/indra/newview/llwebprofile.cpp
@@ -39,12 +39,7 @@
 #include "llviewermedia.h" // FIXME: don't use LLViewerMedia internals
 
 // third-party JSONCPP
-#if !defined(LL_STANDALONE) && defined(LINUX64)
-// The prebuilt linux64 package is packaged wrongly.
-#include <jsoncpp/reader.h>	// JSONCPP
-#else
 #include <json/reader.h>	// JSONCPP
-#endif
 
 /*
  * Workflow:
diff --git a/install.xml b/install.xml
index daa6d06b3..fa02e7038 100644
--- a/install.xml
+++ b/install.xml
@@ -729,9 +729,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>a06ab38628ab7b53b8f3326cd942a6a8</string>
+            <string>4f87662add231b9d4b6c1e5c63560db4</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-linux64-20090922.tar.bz2</uri>
+            <uri>https://github.com/downloads/siana/SingularityViewer/jsoncpp-0.5.0-linux64-20121208.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>