diff options
Diffstat (limited to 'linden/indra/newview/llviewerregion.cpp')
-rw-r--r-- | linden/indra/newview/llviewerregion.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp index 1d380d7..69405d2 100644 --- a/linden/indra/newview/llviewerregion.cpp +++ b/linden/indra/newview/llviewerregion.cpp | |||
@@ -199,6 +199,7 @@ LLViewerRegion::LLViewerRegion(const U64 &handle, | |||
199 | } | 199 | } |
200 | else | 200 | else |
201 | { | 201 | { |
202 | delete mParcelOverlay; | ||
202 | mParcelOverlay = NULL; | 203 | mParcelOverlay = NULL; |
203 | } | 204 | } |
204 | 205 | ||
@@ -244,6 +245,7 @@ void LLViewerRegion::initStats() | |||
244 | 245 | ||
245 | LLViewerRegion::~LLViewerRegion() | 246 | LLViewerRegion::~LLViewerRegion() |
246 | { | 247 | { |
248 | LL_DEBUGS("VOAvatar")<< "LLViewerRegion dtor begin" << llendl; | ||
247 | if(mHttpResponderPtr) | 249 | if(mHttpResponderPtr) |
248 | { | 250 | { |
249 | (static_cast<BaseCapabilitiesComplete*>(mHttpResponderPtr.get()))->setRegion(NULL) ; | 251 | (static_cast<BaseCapabilitiesComplete*>(mHttpResponderPtr.get()))->setRegion(NULL) ; |
@@ -260,6 +262,7 @@ LLViewerRegion::~LLViewerRegion() | |||
260 | 262 | ||
261 | delete mCompositionp; | 263 | delete mCompositionp; |
262 | delete mParcelOverlay; | 264 | delete mParcelOverlay; |
265 | mParcelOverlay = NULL; | ||
263 | delete mLandp; | 266 | delete mLandp; |
264 | delete mEventPoll; | 267 | delete mEventPoll; |
265 | LLHTTPSender::clearSender(mHost); | 268 | LLHTTPSender::clearSender(mHost); |
@@ -267,6 +270,7 @@ LLViewerRegion::~LLViewerRegion() | |||
267 | saveCache(); | 270 | saveCache(); |
268 | 271 | ||
269 | std::for_each(mObjectPartition.begin(), mObjectPartition.end(), DeletePointer()); | 272 | std::for_each(mObjectPartition.begin(), mObjectPartition.end(), DeletePointer()); |
273 | LL_DEBUGS("VOAvatar")<< "LLViewerRegion dtor end" << llendl; | ||
270 | } | 274 | } |
271 | 275 | ||
272 | 276 | ||
@@ -887,12 +891,19 @@ bool LLViewerRegion::isAlive() | |||
887 | 891 | ||
888 | BOOL LLViewerRegion::isOwnedSelf(const LLVector3& pos) | 892 | BOOL LLViewerRegion::isOwnedSelf(const LLVector3& pos) |
889 | { | 893 | { |
890 | if (mParcelOverlay && !gDisconnected) | 894 | if (mParcelOverlay) |
891 | { | 895 | { |
896 | LL_DEBUGS("isOwnedSelf")<< "has mParceloverlay" << LL_ENDL; | ||
897 | if (gDisconnected) | ||
898 | { | ||
899 | LL_DEBUGS("isOwnedSelf")<< "but is gDisconnected" << LL_ENDL; | ||
900 | return FALSE; | ||
901 | } | ||
892 | return mParcelOverlay->isOwnedSelf(pos); | 902 | return mParcelOverlay->isOwnedSelf(pos); |
893 | } | 903 | } |
894 | else | 904 | else |
895 | { | 905 | { |
906 | LL_DEBUGS("isOwnedSelf")<< "has NO mParceloverlay" << LL_ENDL; | ||
896 | return FALSE; | 907 | return FALSE; |
897 | } | 908 | } |
898 | } | 909 | } |