Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Phantom Avatar no longer works, not on SL, not on OpenSim. Bye Phantom~

Browse Source
This commit is contained in:
Lirusaito
2013-03-24 12:44:29 -04:00
parent 7aa0b439a8
commit 16babd38e0
5 changed files with 3 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llagent.cpp
View File

@@ -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;

33
indra/newview/llagent.h
View File

@@ -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;

5
indra/newview/llappviewer.cpp
View File

@@ -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();
}
}

23
indra/newview/llviewermenu.cpp
View File

@@ -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>
/*

2
indra/newview/llviewermessage.cpp
View File

@@ -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())
{