merge from viewer-trunk

Tofu Linden 2010-04-19 15:33:14 +01:00
commit d9da360608
1 changed files with 1 additions and 1 deletions

View File

@ -200,7 +200,7 @@ void LLFloaterMove::setFlyingMode(BOOL fly)
if (instance)
{
instance->setFlyingModeImpl(fly);
LLVOAvatarSelf* avatar_object = gAgent.getAvatarObject();
LLVOAvatarSelf* avatar_object = gAgentAvatarp;
bool is_sitting = avatar_object
&& (avatar_object->getRegion() != NULL)
&& (!avatar_object->isDead())