svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

1 files changed, 1 insertions, 41 deletions

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index c0ad9ffb03..15ab9bac1d 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -309,9 +309,6 @@ LLAgent::LLAgent()
 
 	mbJump(FALSE),
 
-	mWanderTimer(),
-	mWanderTargetGlobal( LLVector3d::zero ),
-
 	mAutoPilot(FALSE),
 	mAutoPilotFlyOnStop(FALSE),
 	mAutoPilotTargetGlobal(),
@@ -2097,36 +2094,6 @@ BOOL LLAgent::getBusy() const
 
 
 //-----------------------------------------------------------------------------
-// updateWanderTarget()
-//-----------------------------------------------------------------------------
-void LLAgent::updateWanderTarget()
-{
-	S32 num_regions;
-	LLViewerRegion*	rand_region;
-	F32 rand_x;
-	F32 rand_y;
-
-	if (mWanderTimer.checkExpirationAndReset(ll_frand(MAX_WANDER_TIME)))
-	{
-		// Pick a random spot to wander towards
-		num_regions = gWorldPointer->mActiveRegionList.getLength();
-		S32 region_num = llround(ll_frand() * num_regions);
-		rand_region = gWorldPointer->mActiveRegionList.getFirstData();
-		S32 i = 0;
-		while (i < region_num)
-		{
-			rand_region = gWorldPointer->mActiveRegionList.getNextData();
-			i++;
-		}
-		rand_x = ll_frand(rand_region->getWidth());
-		rand_y = ll_frand(rand_region->getWidth());
-		
-		stopAutoPilot();
-		startAutoPilotGlobal(rand_region->getPosGlobalFromRegion(LLVector3(rand_x, rand_y, 0.f)));
-	}
-}
-
-//-----------------------------------------------------------------------------
 // startAutoPilotGlobal()
 //-----------------------------------------------------------------------------
 void LLAgent::startAutoPilotGlobal(const LLVector3d &target_global, const std::string& behavior_name, const LLQuaternion *target_rotation, void (*finish_callback)(BOOL, void *),  void *callback_data, F32 stop_distance, F32 rot_threshold)
@@ -4043,10 +4010,6 @@ void LLAgent::changeCameraToFollow(BOOL animate)
 			mbFlagsDirty = TRUE;
 		}
 
-		//RN: this doesn't seem to be necessary and destroys the UE for script-driven cameras
-		//gViewerWindow->setKeyboardFocus( NULL, NULL );
-		//gViewerWindow->setMouseCapture( NULL, NULL );
-
 		if (animate)
 		{
 			startCameraAnimation();
@@ -4110,9 +4073,6 @@ void LLAgent::changeCameraToThirdPerson(BOOL animate)
 			mbFlagsDirty = TRUE;
 		}
 
-		//RN: this doesn't seem to be necessary and destroys the UE for script-driven cameras
-		//gViewerWindow->setKeyboardFocus( NULL, NULL );
-		//gViewerWindow->setMouseCapture( NULL, NULL );
 	}
 
 	// Remove any pitch from the avatar
@@ -4185,7 +4145,7 @@ void LLAgent::changeCameraToCustomizeAvatar(BOOL animate)
 		}
 
 		gViewerWindow->setKeyboardFocus( NULL, NULL );
-		gViewerWindow->setMouseCapture( NULL, NULL );
+		gViewerWindow->setMouseCapture( NULL );
 
 		LLVOAvatar::onCustomizeStart();
 	}