From 8ca1079deeee896f2b468f6f12820a5255820f58 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <inusaito@gmail.com>
Date: Sun, 4 Aug 2013 14:13:45 -0400
Subject: [PATCH] Minor improvement to SignaledType

Allows using non-void functions as callbacks, as originally intended.
---
 indra/newview/lfsimfeaturehandler.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/indra/newview/lfsimfeaturehandler.h b/indra/newview/lfsimfeaturehandler.h
index 83acdd95a..f2b8d3731 100644
--- a/indra/newview/lfsimfeaturehandler.h
+++ b/indra/newview/lfsimfeaturehandler.h
@@ -20,14 +20,13 @@
 
 #include "llsingleton.h"
 
-template<typename Type>
+template<typename Type, typename Slot = void()>
 class SignaledType
 {
 public:
 	SignaledType() : mValue() {}
 	SignaledType(Type b) : mValue(b) {}
 
-	template<typename Slot>
 	boost::signals2::connection connect(Slot slot) { return mSignal.connect(slot); }
 
 	SignaledType& operator =(Type val)
@@ -42,7 +41,7 @@ public:
 	operator Type() const { return mValue; }
 
 private:
-	boost::signals2::signal<void()> mSignal;
+	boost::signals2::signal<Slot> mSignal;
 	Type mValue;
 };