From 58bce2d205bee3f5adb33b15efe73098e77429eb Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Wed, 9 Sep 2009 01:26:44 +0000
Subject: merge -r132032-132812
 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1

---
 indra/llxuixml/llinitparam.cpp | 8 ++++++++
 indra/llxuixml/llinitparam.h   | 8 +++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'indra/llxuixml')

diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp
index d35e7b40f8..1b867b79c9 100644
--- a/indra/llxuixml/llinitparam.cpp
+++ b/indra/llxuixml/llinitparam.cpp
@@ -516,6 +516,14 @@ namespace LLInitParam
 		return false;
 	}
 
+	template<>
+	bool ParamCompare<boost::function<void (void)> >::equals(
+		const boost::function<void (void)> &a,
+		const boost::function<void (void)> &b)
+	{
+		return false;
+	}
+
 	template<>
 	bool ParamCompare<LLSD>::equals(const LLSD &a, const LLSD &b)
 	{
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h
index a1d0831939..baa782916e 100644
--- a/indra/llxuixml/llinitparam.h
+++ b/indra/llxuixml/llinitparam.h
@@ -1815,7 +1815,13 @@ namespace LLInitParam
 	bool ParamCompare<boost::function<void (const LLSD &,const LLSD &)> >::equals(
 		const boost::function<void (const LLSD &,const LLSD &)> &a,
 		const boost::function<void (const LLSD &,const LLSD &)> &b);
-	
+
+	template<>
+	bool ParamCompare<boost::function<void (void)> >::equals(
+		const boost::function<void (void)> &a,
+		const boost::function<void (void)> &b);
+
+
 	template<>
 	bool ParamCompare<LLSD>::equals(const LLSD &a, const LLSD &b);
 }
-- 
cgit v1.2.3