diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-19 14:26:08 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-19 14:26:08 +0100 |
| commit | 47c8cb4891adc74f928f7712f79d7d1032bea567 (patch) | |
| tree | 1669484c4e69ee476ed27d3fd999fd93a54bfad2 /indra/newview/llmoveview.cpp | |
| parent | 689fdd553c38ddef9c33f90c0b408bb2e9299742 (diff) | |
| parent | 532d732645f2369d17eba9c2ed0d594b486d416e (diff) | |
merge from viewer-trunk
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..7df5a33313 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 = gAgent.getAvatarObject(); + bool is_sitting = avatar_object + && (avatar_object->getRegion() != NULL) + && (!avatar_object->isDead()) + && avatar_object->isSitting(); instance->showModeButtons(!fly && !is_sitting); } if (fly) |