diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-02-05 13:19:16 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-02-05 13:19:16 -0800 |
| commit | 4c4925e8afaff67a132ed2b43f916792e7fbb4a8 (patch) | |
| tree | 6d1fdd1a09cc5a22e319a634c99e063da9f2fc18 /indra/newview/llvoavatarself.cpp | |
| parent | dcf82b742a90b9004d7cd0a6be6610a6195e693e (diff) | |
| parent | 977de17dda0b3bf5e7ae96f68b329ef0297ce7fd (diff) | |
Merge
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
| -rw-r--r-- | indra/newview/llvoavatarself.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index b1ea8a1bbb..13e28b246a 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -510,8 +510,12 @@ BOOL LLVOAvatarSelf::buildMenus() LLVOAvatarSelf::~LLVOAvatarSelf() { - gAgent.setAvatarObject(NULL); - gAgentWearables.setAvatarObject(NULL); + // gAgents pointer might have been set to a different Avatar Self, don't get rid of it if so. + if (gAgent.getAvatarObject() == this) + { + gAgent.setAvatarObject(NULL); + gAgentWearables.setAvatarObject(NULL); + } delete mScreenp; mScreenp = NULL; } |