diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-04-19 13:53:57 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-04-19 13:53:57 -0400 |
| commit | 7f0a7789903809d489e9f85575be18c88df1ea98 (patch) | |
| tree | 1aa3428c097ef8e19f1e518eb2e3e6996d16a2bc /indra/newview/llmoveview.cpp | |
| parent | aa5e494e0cf1242dcd35725576667ab1a935363a (diff) | |
| parent | 1c352ebb5bfda6d53c844dca130302b79b918796 (diff) | |
merge
Diffstat (limited to 'indra/newview/llmoveview.cpp')
| -rw-r--r-- | indra/newview/llmoveview.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index 0ddc4efc81..2f22512aba 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -200,7 +200,11 @@ void LLFloaterMove::setFlyingMode(BOOL fly) if (instance) { instance->setFlyingModeImpl(fly); - BOOL is_sitting = isAgentAvatarValid() && gAgentAvatarp->isSitting(); + LLVOAvatarSelf* avatar_object = gAgentAvatarp; + bool is_sitting = avatar_object + && (avatar_object->getRegion() != NULL) + && (!avatar_object->isDead()) + && avatar_object->isSitting(); instance->showModeButtons(!fly && !is_sitting); } if (fly) |