summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-19 15:33:14 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-19 15:33:14 +0100
commitd9da36060809b1ad9bee98a93cf999484bbbea5a (patch)
tree553c52b9110054bc112fa0cdf334e958cbe02c51 /indra/newview
parentf28a9b3ca52978772e2963f4610a1bab1f1e9cee (diff)
parent1c352ebb5bfda6d53c844dca130302b79b918796 (diff)
merge from viewer-trunk
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llmoveview.cpp2
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())