diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-19 15:23:04 +0100 | 
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-19 15:23:04 +0100 | 
| commit | 1c352ebb5bfda6d53c844dca130302b79b918796 (patch) | |
| tree | 871a1e0a13531fede2aea4654b1066c9f53407bc | |
| parent | 532d732645f2369d17eba9c2ed0d594b486d416e (diff) | |
repair merge from viewer-hotfix w.r.t. agent API changes.
| -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()) | 
