diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-06-29 18:56:57 +0300 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-06-29 18:56:57 +0300 |
| commit | d3d2e0be292056ff335ae7a0caf7a6407ef074ca (patch) | |
| tree | 50c227be0cd19c7cedba7360bb4950304a306d01 /indra/newview/llviewerobjectlist.cpp | |
| parent | 05222b7a32c6e3406f1bae90664181d3699a10e8 (diff) | |
| parent | f308109fe6a96d1cb40185a4fe4f16d8e82d814a (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 752aeaaab0..fc94fbafac 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -894,10 +894,10 @@ void LLViewerObjectList::removeDrawable(LLDrawable* drawablep) BOOL LLViewerObjectList::killObject(LLViewerObject *objectp) { - // Don't ever kill gAgentAvatarp, just mark it as null region instead. + // Don't ever kill gAgentAvatarp, just force it to the agent's region if (objectp == gAgentAvatarp) { - objectp->setRegion(NULL); + objectp->setRegion(gAgent.getRegion()); return FALSE; } |