From 16babd38e0fead3acfaabfc905d5d57a243ecd93 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sun, 24 Mar 2013 12:44:29 -0400
Subject: [PATCH] Phantom Avatar no longer works, not on SL, not on OpenSim.
 Bye Phantom~

---
 indra/newview/llagent.cpp         | 20 -------------------
 indra/newview/llagent.h           | 33 -------------------------------
 indra/newview/llappviewer.cpp     |  5 +----
 indra/newview/llviewermenu.cpp    | 23 ++-------------------
 indra/newview/llviewermessage.cpp |  2 --
 5 files changed, 3 insertions(+), 80 deletions(-)

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 08ef9756b..5ee95da8f 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -229,8 +229,6 @@ private:
 // Statics
 //
 
-BOOL LLAgent::exlPhantom = 0;
-
 const F32 LLAgent::TYPING_TIMEOUT_SECS = 5.f;
 
 std::map<std::string, std::string> LLAgent::sTeleportErrorMessages;
@@ -651,17 +649,6 @@ BOOL LLAgent::getFlying() const
 	return mControlFlags & AGENT_CONTROL_FLY; 
 }
 
-// Better Set Phantom options ~Charbl
-void LLAgent::setPhantom(BOOL phantom)
-{
-	exlPhantom = phantom;
-}
-
-BOOL LLAgent::getPhantom()
-{
-	return exlPhantom;
-}
-
 //-----------------------------------------------------------------------------
 // setFlying()
 //-----------------------------------------------------------------------------
@@ -757,13 +744,6 @@ void LLAgent::standUp()
 // [/RLVa:KB]
 }
 
-void LLAgent::togglePhantom()
-{
-	BOOL phan = !(exlPhantom);
-
-	setPhantom( phan );
-}
-
 void LLAgent::handleServerBakeRegionTransition(const LLUUID& region_id)
 {
 	llinfos << "called" << llendl;
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 91b0bcb4b..d49fed1cf 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -899,39 +899,6 @@ public:
  **                                                                            **
  *******************************************************************************/
 
-/********************************************************************************
- **                                                                            **
- **                   Phantom mode!
- **/
-
-public:
-	static BOOL			getPhantom();
-	static void			setPhantom(BOOL phantom);
-	static void			togglePhantom();
-private:
-	static BOOL exlPhantom;
-/**                    PHANTOM
- **                                                                            **
- *******************************************************************************/
- 	
-/********************************************************************************
- **                                                                            **
- **                    Depreciated stuff. Move when ready.
- **/
-public:
-	//What's this t-posed stuff from?
-	static BOOL			isTPosed() { return mForceTPose; }
-	static void			setTPosed(BOOL TPose) { mForceTPose = TPose; }
-	static void			toggleTPosed();
-	
-private:
- 	static BOOL 	mForceTPose;
-	
-
-/**                    DEPRECIATED
- **                                                                            **
- *******************************************************************************/
- 
 };
 
 extern LLAgent gAgent;
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 1f5977a7f..ed2394392 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3913,10 +3913,7 @@ void LLAppViewer::idle()
 		    LLFastTimer t(FTM_AGENT_UPDATE);
 		    // Send avatar and camera info
 		    last_control_flags = gAgent.getControlFlags();
-		    if(!gAgent.getPhantom())
-			{
-				send_agent_update(TRUE);
-			}
+			send_agent_update(TRUE);
 		    agent_update_timer.reset();
 	    }
 	}
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index e17ec68cd..b6d71012b 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -409,7 +409,6 @@ BOOL handle_check_pose(void* userdata) {
 
 
 void handle_force_ground_sit(void*);
-void handle_phantom_avatar(void*);
 void handle_hide_typing_notification(void*);
 void handle_close_all_notifications(void*);
 void handle_open_message_log(void*);
@@ -711,7 +710,6 @@ void init_menus()
 	menu->addSeparator();
 	menu->addChild(new LLMenuItemCallGL(  "Fake Away Status", &handle_fake_away_status, NULL));
 	menu->addChild(new LLMenuItemCallGL(  "Force Ground Sit", &handle_force_ground_sit, NULL));
-	menu->addChild(new LLMenuItemCallGL(  "Phantom Avatar", &handle_phantom_avatar, NULL, NULL, 'P', MASK_CONTROL | MASK_ALT));
 
 	menu->addSeparator();
 	menu->addChild(new LLMenuItemCallGL( "Animation Override...",
@@ -3707,9 +3705,9 @@ void handle_fake_away_status(void*)
 
 void handle_force_ground_sit(void*)
 {
-	if (gAgentAvatarp)
+	if (isAgentAvatarValid())
 	{
-		if(!gAgentAvatarp->isSitting())
+		if (!gAgentAvatarp->isSitting())
 		{
 			gAgent.setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
 		} 
@@ -3720,23 +3718,6 @@ void handle_force_ground_sit(void*)
 	}
 }
 
-void handle_phantom_avatar(void*)
-{
-	BOOL ph = LLAgent::getPhantom();
-
-	if (ph)
-		gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
-	else
-		gAgent.setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
-	
-	LLAgent::togglePhantom();
-	ph = LLAgent::getPhantom();
-	LLChat chat;
-	chat.mSourceType = CHAT_SOURCE_SYSTEM;
-	chat.mText = llformat("%s%s","Phantom ",(ph ? "On" : "Off"));
-	LLFloaterChat::addChat(chat);
-}
-
 // </edit>
 
 /*
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 2c566a46c..448d54373 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4502,8 +4502,6 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
 		return;
 	}
 
-	if(gAgent.getPhantom()) return; //Don't want to do this while phantom
-
 	// We have already requested to log out.  Don't send agent updates.
 	if(LLAppViewer::instance()->logoutRequestSent())
 	{