1 files changed, 74 insertions, 59 deletions

diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index e1590cc..f745aca 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -76,7 +76,74 @@ extern BOOL gNoRender;
 const F32 WATER_TEXTURE_SCALE = 8.f;                    //  Number of times to repeat the water texture across a region
 const S16 MAX_MAP_DIST = 10;
 
+class BaseCapabilitiesComplete : public LLHTTPClient::Responder
+{
+        LOG_CLASS(BaseCapabilitiesComplete);
+public:
+    BaseCapabilitiesComplete(LLViewerRegion* region)
+                : mRegion(region)
+    { }
+        virtual ~BaseCapabilitiesComplete()
+        {
+                if(mRegion)
+                {
+                        mRegion->setHttpResponderPtrNULL() ;
+                }
+        }
 
+        void setRegion(LLViewerRegion* region)
+        {
+                mRegion = region ;
+        }
+
+    void error(U32 statusNum, const std::string& reason)
+    {
+                LL_WARNS2("AppInit", "Capabilities") << statusNum << ": " << reason << LL_ENDL;
+                
+                if (STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState())
+                {
+                        LLStartUp::setStartupState( STATE_SEED_CAP_GRANTED );
+                }
+    }
+
+    void result(const LLSD& content)
+    {
+                if(!mRegion || this != mRegion->getHttpResponderPtr())//region is removed or responder is not created.
+                {
+                        return ;
+                }
+
+                LLSD::map_const_iterator iter;
+                for(iter = content.beginMap(); iter != content.endMap(); ++iter)
+                {
+                        mRegion->setCapability(iter->first, iter->second);
+                        LL_DEBUGS2("AppInit", "Capabilities") << "got capability for " 
+                                << iter->first << LL_ENDL;
+
+                        /* HACK we're waiting for the ServerReleaseNotes */
+                        if ((iter->first == "ServerReleaseNotes") && (LLFloaterReleaseMsg::sDisplayMessage))
+                        {
+                                LLFloaterReleaseMsg::show();
+                                LLFloaterReleaseMsg::sDisplayMessage = false;
+                        }
+                }
+                
+                if (STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState())
+                {
+                        LLStartUp::setStartupState( STATE_SEED_CAP_GRANTED );
+                }
+        }
+
+    static boost::intrusive_ptr<BaseCapabilitiesComplete> build(
+                                                                LLViewerRegion* region)
+    {
+                return boost::intrusive_ptr<BaseCapabilitiesComplete>(
+                                                         new BaseCapabilitiesComplete(region));
+    }
+
+private:
+        LLViewerRegion* mRegion;
+};
 
 
 LLViewerRegion::LLViewerRegion(const U64 &handle,
@@ -103,7 +170,6 @@ LLViewerRegion::LLViewerRegion(const U64 &handle,
         mEventPoll(NULL)
 {
         mWidth = region_width_meters;
-
         mOriginGlobal = from_region_handle(handle); 
         updateRenderMatrix();
 
@@ -170,10 +236,13 @@ void LLViewerRegion::initStats()
         mAlive = FALSE;                                 // can become false if circuit disconnects
 }
 
-
-
 LLViewerRegion::~LLViewerRegion() 
 {
+        if(mHttpResponderPtr)
+        {
+                (static_cast<BaseCapabilitiesComplete*>(mHttpResponderPtr.get()))->setRegion(NULL) ;
+        }
+
         gVLManager.cleanupData(this);
         // Can't do this on destruction, because the neighbor pointers might be invalid.
         // This should be reference counted...
@@ -1303,61 +1372,6 @@ void LLViewerRegion::unpackRegionHandshake()
         msg->sendReliable(host);
 }
 
-
-
-class BaseCapabilitiesComplete : public LLHTTPClient::Responder
-{
-        LOG_CLASS(BaseCapabilitiesComplete);
-public:
-    BaseCapabilitiesComplete(LLViewerRegion* region)
-                : mRegion(region)
-    { }
-
-    void error(U32 statusNum, const std::string& reason)
-    {
-                LL_WARNS2("AppInit", "Capabilities") << statusNum << ": " << reason << LL_ENDL;
-                
-                if (STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState())
-                {
-                        LLStartUp::setStartupState( STATE_SEED_CAP_GRANTED );
-                }
-    }
-
-    void result(const LLSD& content)
-    {
-                LLSD::map_const_iterator iter;
-                for(iter = content.beginMap(); iter != content.endMap(); ++iter)
-                {
-                        mRegion->setCapability(iter->first, iter->second);
-                        LL_DEBUGS2("AppInit", "Capabilities") << "got capability for " 
-                                << iter->first << LL_ENDL;
-
-                        /* HACK we're waiting for the ServerReleaseNotes */
-                        if ((iter->first == "ServerReleaseNotes") && (LLFloaterReleaseMsg::sDisplayMessage))
-                        {
-                                LLFloaterReleaseMsg::show();
-                                LLFloaterReleaseMsg::sDisplayMessage = false;
-                        }
-                }
-                
-                if (STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState())
-                {
-                        LLStartUp::setStartupState( STATE_SEED_CAP_GRANTED );
-                }
-        }
-
-    static boost::intrusive_ptr<BaseCapabilitiesComplete> build(
-                                                                LLViewerRegion* region)
-    {
-                return boost::intrusive_ptr<BaseCapabilitiesComplete>(
-                                                         new BaseCapabilitiesComplete(region));
-    }
-
-private:
-        LLViewerRegion* mRegion;
-};
-
-
 void LLViewerRegion::setSeedCapability(const std::string& url)
 {
   if (getCapability("Seed") == url)
@@ -1408,7 +1422,8 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
 
         llinfos << "posting to seed " << url << llendl;
 
-        LLHTTPClient::post(url, capabilityNames, BaseCapabilitiesComplete::build(this));
+        mHttpResponderPtr = BaseCapabilitiesComplete::build(this) ;
+        LLHTTPClient::post(url, capabilityNames, mHttpResponderPtr);
 }
 
 void LLViewerRegion::setCapability(const std::string& name, const std::string& url)