From 39e0e4ad9e70c058703367284760aaae57c5e7d8 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Mon, 10 Nov 2014 13:36:23 -0500
Subject: [PATCH] LFSimFeatureHandler cleanup~

---
 indra/newview/lfsimfeaturehandler.cpp | 30 ---------------------------
 indra/newview/lfsimfeaturehandler.h   | 12 +++++------
 2 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/indra/newview/lfsimfeaturehandler.cpp b/indra/newview/lfsimfeaturehandler.cpp
index e06fe5891..40c4c8a15 100644
--- a/indra/newview/lfsimfeaturehandler.cpp
+++ b/indra/newview/lfsimfeaturehandler.cpp
@@ -104,33 +104,3 @@ void LFSimFeatureHandler::setSupportedFeatures()
 		}
 	}
 }
-
-boost::signals2::connection LFSimFeatureHandler::setSupportsExportCallback(const SignaledType<bool>::slot_t& slot)
-{
-	return mSupportsExport.connect(slot);
-}
-
-boost::signals2::connection LFSimFeatureHandler::setDestinationGuideURLCallback(const SignaledType<std::string>::slot_t& slot)
-{
-	return mDestinationGuideURL.connect(slot);
-}
-
-boost::signals2::connection LFSimFeatureHandler::setSearchURLCallback(const SignaledType<std::string>::slot_t& slot)
-{
-	return mSearchURL.connect(slot);
-}
-
-boost::signals2::connection LFSimFeatureHandler::setSayRangeCallback(const SignaledType<U32>::slot_t& slot)
-{
-	return mSayRange.connect(slot);
-}
-
-boost::signals2::connection LFSimFeatureHandler::setShoutRangeCallback(const SignaledType<U32>::slot_t& slot)
-{
-	return mShoutRange.connect(slot);
-}
-
-boost::signals2::connection LFSimFeatureHandler::setWhisperRangeCallback(const SignaledType<U32>::slot_t& slot)
-{
-	return mWhisperRange.connect(slot);
-}
diff --git a/indra/newview/lfsimfeaturehandler.h b/indra/newview/lfsimfeaturehandler.h
index c1260d4cc..72b75a9c2 100644
--- a/indra/newview/lfsimfeaturehandler.h
+++ b/indra/newview/lfsimfeaturehandler.h
@@ -61,12 +61,12 @@ public:
 	void setSupportedFeatures();
 
 	// Connection setters
-	boost::signals2::connection setSupportsExportCallback(const SignaledType<bool>::slot_t& slot);
-	boost::signals2::connection setDestinationGuideURLCallback(const SignaledType<std::string>::slot_t& slot);
-	boost::signals2::connection setSearchURLCallback(const SignaledType<std::string>::slot_t& slot);
-	boost::signals2::connection setSayRangeCallback(const SignaledType<U32>::slot_t& slot);
-	boost::signals2::connection setShoutRangeCallback(const SignaledType<U32>::slot_t& slot);
-	boost::signals2::connection setWhisperRangeCallback(const SignaledType<U32>::slot_t& slot);
+	boost::signals2::connection setSupportsExportCallback(const SignaledType<bool>::slot_t& slot) { return mSupportsExport.connect(slot); }
+	boost::signals2::connection setDestinationGuideURLCallback(const SignaledType<std::string>::slot_t& slot) { return mDestinationGuideURL.connect(slot); }
+	boost::signals2::connection setSearchURLCallback(const SignaledType<std::string>::slot_t& slot) { return mSearchURL.connect(slot); }
+	boost::signals2::connection setSayRangeCallback(const SignaledType<U32>::slot_t& slot) { return mSayRange.connect(slot); }
+	boost::signals2::connection setShoutRangeCallback(const SignaledType<U32>::slot_t& slot) { return mShoutRange.connect(slot); }
+	boost::signals2::connection setWhisperRangeCallback(const SignaledType<U32>::slot_t& slot) { return mWhisperRange.connect(slot); }
 
 	// Accessors
 	bool simSupportsExport() const { return mSupportsExport; }