diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-12-12 21:47:24 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-12-12 21:47:24 +0100 |
| commit | a18ea9d92923e331c0a3e179e126659e694b1c07 (patch) | |
| tree | ac82c05ccab33639a24bd661e8edf602d7912bb4 /indra/newview/llworld.cpp | |
| parent | ef301c59832025240a20f9959008a33dc52233f9 (diff) | |
Clean up pending requests when regions are removed from LLWorld
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index ed6c8bd32b..604f7f2b56 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -275,7 +275,9 @@ void LLWorld::removeRegion(const LLHost &host) mActiveRegionList.remove(regionp); mCulledRegionList.remove(regionp); mVisibleRegionList.remove(regionp); - + + mRegionRemovedSignal(regionp); + delete regionp; updateWaterObjects(); @@ -1259,6 +1261,11 @@ bool LLWorld::isRegionListed(const LLViewerRegion* region) const return it != mRegionList.end(); } +boost::signals2::connection LLWorld::setRegionRemovedCallback(const region_remove_signal_t::slot_type& cb) +{ + return mRegionRemovedSignal.connect(cb); +} + LLHTTPRegistration<LLEstablishAgentCommunication> gHTTPRegistrationEstablishAgentCommunication( "/message/EstablishAgentCommunication"); |