Beginning to pull LLVOAvatarSelf out from LLVOAvatar.

2011-10-02 02:51:10 -05:00
parent 21f39471f1
commit 74dc875a27
68 changed files with 1624 additions and 1248 deletions
--- a/indra/newview/llviewerkeyboard.cpp
+++ b/indra/newview/llviewerkeyboard.cpp
@@ -44,7 +44,7 @@
 #include "llmoveview.h"
 #include "lltoolfocus.h"
 #include "llviewerwindow.h"
-#include "llvoavatar.h"
+#include "llvoavatarself.h"

 //
 // Constants
@@ -843,7 +843,7 @@ EKeyboardMode LLViewerKeyboard::getMode()
 	{
 		return MODE_EDIT_AVATAR;
 	}
-	else if (gAgent.getAvatarObject() && gAgent.getAvatarObject()->isSitting())
+	else if (gAgentAvatarp && gAgentAvatarp->isSitting())
 	{
 		return MODE_SITTING;
 	}