From 91acda05d57c360924a46696a44a5b7841b84543 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 15 May 2012 16:49:13 -0700
Subject: EXP-1928: Removing some commented asserts following more development
 testing.

---
 indra/newview/llagent.cpp         | 10 +---------
 indra/newview/llviewermessage.cpp |  3 +--
 2 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index fb217f2186..d27fc252d8 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -3604,7 +3604,7 @@ bool LLAgent::teleportCore(bool is_local)
 
 void LLAgent::restartFailedTeleportRequest()
 {
-	// XXX stinson 05/11/2012 llassert(hasFailedTeleportRequest());
+	llassert(hasFailedTeleportRequest());
 	if (hasFailedTeleportRequest())
 	{
 		mFailedTeleportRequest->doTeleport();
@@ -3613,7 +3613,6 @@ void LLAgent::restartFailedTeleportRequest()
 
 void LLAgent::clearFailedTeleportRequest()
 {
-	// XXX stinson 05/11/2012 llassert(hasFailedTeleportRequest());
 	if (hasFailedTeleportRequest())
 	{
 		mFailedTeleportRequest.reset();
@@ -3628,7 +3627,6 @@ void LLAgent::setMaturityRatingChangeDuringTeleport(int pMaturityRatingChange)
 
 void LLAgent::handleTeleportFinished()
 {
-	// XXX stinson 05/11/2012 llassert(hasCurrentTeleportRequest());
 	if (hasCurrentTeleportRequest())
 	{
 		mCurrentTeleportRequest.reset();
@@ -3649,8 +3647,6 @@ void LLAgent::handleTeleportFinished()
 
 void LLAgent::handleTeleportFailed()
 {
-	// XXX stinson 05/11/2012 llassert(hasCurrentTeleportRequest());
-	// XXX stinson 05/11/2012 llassert(!hasFailedTeleportRequest());
 	if (hasCurrentTeleportRequest())
 	{
 		mFailedTeleportRequest = mCurrentTeleportRequest;
@@ -3690,7 +3686,6 @@ void LLAgent::teleportRequest(
 // Landmark ID = LLUUID::null means teleport home
 void LLAgent::teleportViaLandmark(const LLUUID& landmark_asset_id)
 {
-	// XXX stinson 05/11/2012 llassert(!hasCurrentTeleportRequest());
 	mCurrentTeleportRequest = LLTeleportRequestPtr(new LLTeleportRequestViaLandmark(landmark_asset_id));
 	mCurrentTeleportRequest->doTeleport();
 }
@@ -3712,7 +3707,6 @@ void LLAgent::doTeleportViaLandmark(const LLUUID& landmark_asset_id)
 
 void LLAgent::teleportViaLure(const LLUUID& lure_id, BOOL godlike)
 {
-	// XXX stinson 05/11/2012 llassert(!hasCurrentTeleportRequest());
 	mCurrentTeleportRequest = LLTeleportRequestPtr(new LLTeleportRequestViaLure(lure_id, godlike));
 	mCurrentTeleportRequest->doTeleport();
 }
@@ -3768,7 +3762,6 @@ void LLAgent::teleportCancel()
 
 void LLAgent::teleportViaLocation(const LLVector3d& pos_global)
 {
-	// XXX stinson 05/11/2012 llassert(!hasCurrentTeleportRequest());
 	mCurrentTeleportRequest = LLTeleportRequestPtr(new LLTeleportRequestViaLocation(pos_global));
 	mCurrentTeleportRequest->doTeleport();
 }
@@ -3817,7 +3810,6 @@ void LLAgent::doTeleportViaLocation(const LLVector3d& pos_global)
 // Teleport to global position, but keep facing in the same direction 
 void LLAgent::teleportViaLocationLookAt(const LLVector3d& pos_global)
 {
-	// XXX stinson 05/11/2012 llassert(!hasCurrentTeleportRequest());
 	mCurrentTeleportRequest = LLTeleportRequestPtr(new LLTeleportRequestViaLocationLookAt(pos_global));
 	mCurrentTeleportRequest->doTeleport();
 }
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 3712e56f7c..56522bc819 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5389,12 +5389,11 @@ void handle_maturity_preference_change(const LLSD &pResponse, int pMaturityRatin
 {
 	if (pResponse.isUndefined())
 	{
-		// XXX stinson 05/11/2012 llinfos << "Maturity response ==> <null>" << llendl;
+		// XXX stinson 05/15/2012 : should report some notification that the preference has not changed
 		gAgent.clearFailedTeleportRequest();
 	}
 	else
 	{
-		// XXX stinson 05/11/2012 linfos << "Maturity response ==> '" << pResponse << "'" << llendl;
 		gAgent.setMaturityRatingChangeDuringTeleport(pMaturityRatingChange);
 		gAgent.restartFailedTeleportRequest();
 	}
-- 
cgit v1.2.3