From 1c352ebb5bfda6d53c844dca130302b79b918796 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Mon, 19 Apr 2010 15:23:04 +0100
Subject: repair merge from viewer-hotfix w.r.t. agent API changes.

---
 indra/newview/llmoveview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llmoveview.cpp')

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())
-- 
cgit v1.2.3