livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STORM-1831 Changing addRegionChangedCallback to more closely resemble the feature it replaces. This fixes the crashes reported by Whirly ;-)

meow-7.2.2
Ima Mechanique 2013-12-18 06:26:22 +00:00
parent f6d86fcacf
commit 86275f22e3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llagent.cpp
View File

@ -976,7 +976,7 @@ LLHost LLAgent::getRegionHost() const
}
}
boost::signals2::connection LLAgent::addRegionChangedCallback(region_changed_callback_t cb)
boost::signals2::connection LLAgent::addRegionChangedCallback(const region_changed_signal_t::slot_type& cb)
{
return mRegionChangedSignal.connect(cb);
}

6
indra/newview/llagent.h
View File

@ -271,13 +271,13 @@ private:
* // you may or may not want to remove that callback
* }
*/
typedef boost::function<void()> region_changed_callback_t;
boost::signals2::connection addRegionChangedCallback(region_changed_callback_t);
typedef boost::signals2::signal<void()> region_changed_signal_t;
boost::signals2::connection addRegionChangedCallback(const region_changed_signal_t::slot_type& cb);
void removeRegionChangedCallback(boost::signals2::connection callback);
private:
LLViewerRegion *mRegionp;
typedef boost::signals2::signal<void()> region_changed_signal_t;
region_changed_signal_t mRegionChangedSignal;
//--------------------------------------------------------------------