diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-19 15:33:14 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-19 15:33:14 +0100 |
| commit | d31b95b9aa26070825964fc782412690c6624872 (patch) | |
| tree | 08ab95043ba66c8c4df2d723aaaeef094b4eeead /indra/newview | |
| parent | b362cc60d9f458626bc69873c5801b3dbd25aae3 (diff) | |
| parent | 1c352ebb5bfda6d53c844dca130302b79b918796 (diff) | |
merge from viewer-trunk
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llmoveview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index 7df5a33313..2f22512aba 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -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()) |