summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2014-03-25 12:06:27 -0700
committerdolphin <dolphin@lindenlab.com>2014-03-25 12:06:27 -0700
commit1d83b76e077054f880920efb3b2fc0c38094fc33 (patch)
treec4afb471d11bcb12cd4a08f72af82a74bc08d16a
parentc82a884ef46a31a999f4f402efdc0f42d457f695 (diff)
Attempting ti fix the mac build
-rw-r--r--indra/newview/llexperiencelog.cpp4
-rw-r--r--indra/newview/llexperiencelog.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llexperiencelog.cpp b/indra/newview/llexperiencelog.cpp
index 5f9fab306b..66129a39a2 100644
--- a/indra/newview/llexperiencelog.cpp
+++ b/indra/newview/llexperiencelog.cpp
@@ -254,7 +254,7 @@ void LLExperienceLog::setMaxDays( U32 val )
}
}
-LLExperienceLog::callback_connection_t LLExperienceLog::addUpdateSignal( callback_slot_t cb )
+LLExperienceLog::callback_connection_t LLExperienceLog::addUpdateSignal( const callback_slot_t& cb )
{
return mSignals.connect(cb);
}
@@ -268,6 +268,6 @@ void LLExperienceLog::setNotifyNewEvent( bool val )
}
else if( val && !mNotifyConnection.connected())
{
- mNotifyConnection = addUpdateSignal(notify);
+ mNotifyConnection = addUpdateSignal((callback_slot_t)notify);
}
}
diff --git a/indra/newview/llexperiencelog.h b/indra/newview/llexperiencelog.h
index 5bc47c4e8d..1e473e27d5 100644
--- a/indra/newview/llexperiencelog.h
+++ b/indra/newview/llexperiencelog.h
@@ -38,7 +38,7 @@ public:
callback_signal_t;
typedef callback_signal_t::slot_type callback_slot_t;
typedef boost::signals2::connection callback_connection_t;
- callback_connection_t addUpdateSignal(callback_slot_t cb);
+ callback_connection_t addUpdateSignal(const callback_slot_t& cb);
void initialize();