diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-04-19 12:53:59 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-04-19 12:53:59 -0700 |
| commit | 5f80e5681c7a0e9f0fc5889ede435c79358fc639 (patch) | |
| tree | ee9e5826ee220a971aa7990ef83a64644bf644d9 /indra/newview/llmoveview.cpp | |
| parent | a1a43f7942f68e75eaadaa9c5280ac196c4ed6a7 (diff) | |
| parent | 7f0a7789903809d489e9f85575be18c88df1ea98 (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) |