From 288a259ac186610bbb70fc58999ba360d9d14f54 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 15 Apr 2013 18:37:25 -0700
Subject: [PATCH] more conflict resolutions for broken build after pull

---
 interface/src/Head.cpp | 36 ------------------------------------
 interface/src/main.cpp |  4 ++--
 2 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp
index 898d213781..2e679763f0 100644
--- a/interface/src/Head.cpp
+++ b/interface/src/Head.cpp
@@ -1169,42 +1169,6 @@ void Head::renderBody() {
 	
 }
 
-
-
-// Transmit data to agents requesting it
-// called on me just prior to sending data to others (continuasly called)
-int Head::getBroadcastData(char* data) {
-    // Copy data for transmission to the buffer, return length of data
-    sprintf(data, "H%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f",
-            getRenderPitch() + Pitch, -getRenderYaw() + 180 -Yaw, Roll,
-			//avatar.yaw, avatar.pitch, avatar.roll,
-            bodyPosition.x + leanSideways, bodyPosition.y, bodyPosition.z + leanForward,
-            loudness, averageLoudness,
-            //hand->getPos().x, hand->getPos().y, hand->getPos().z);  //previous to Ventrella change
-            bone[ AVATAR_BONE_RIGHT_HAND ].position.x, 
-			bone[ AVATAR_BONE_RIGHT_HAND ].position.y, 
-			bone[ AVATAR_BONE_RIGHT_HAND ].position.z ); 
-    return strlen(data);
-}
-
-
-//called on the other agents - assigns it to my views of the others
-void Head::parseData(void *data, int size) {
-	sscanf
-	(
-		(char *)data, "H%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f",
-		&Pitch, &Yaw, &Roll,
-		//&avatar.yaw, &avatar.pitch, &avatar.roll,
-		&bodyPosition.x, &bodyPosition.y, &bodyPosition.z,
-		&loudness, &averageLoudness,
-		&bone[ AVATAR_BONE_RIGHT_HAND ].position.x, 
-		&bone[ AVATAR_BONE_RIGHT_HAND ].position.y, 
-		&bone[ AVATAR_BONE_RIGHT_HAND ].position.z
-	);
-	
-	handBeingMoved = true;
-}
-
 void Head::SetNewHeadTarget(float pitch, float yaw) {
     PitchTarget = pitch;
     YawTarget = yaw;
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 46d72bb076..9df332a25e 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -696,7 +696,7 @@ void display(void)
 			//-----------------------------------------------
 			// set the camera to looking at my own face
 			//-----------------------------------------------
-			myCamera.setTargetPosition	( myAvatar.getPos() ); 
+			myCamera.setTargetPosition	( myAvatar.getBodyPosition() );
 			myCamera.setYaw				( - myAvatar.getBodyYaw() );
 			myCamera.setPitch			( 0.0  );
 			myCamera.setRoll			( 0.0  );
@@ -708,7 +708,7 @@ void display(void)
 			//----------------------------------------------------
 			// set the camera to third-person view behind my av
 			//----------------------------------------------------		
-			myCamera.setTargetPosition	( myAvatar.getPos() ); 
+			myCamera.setTargetPosition	( myAvatar.getBodyPosition() );
 			myCamera.setYaw				( 180.0 - myAvatar.getBodyYaw() );
 			myCamera.setPitch			(  10.0 );
 			myCamera.setRoll			(   0.0 );