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

Merge git://github.com/AlericInglewood/SingularityViewer

Browse Source 
Conflicts:
	indra/newview/llpaneldisplay.cpp
	indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
This commit is contained in:
Siana Gearz
2011-06-05 19:56:46 +02:00
parent 1473486f23 50ce0c4183
commit 630059a74f
587 changed files with 27725 additions and 13002 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
indra/newview/llviewermessage.cpp
View File

@@ -49,7 +49,6 @@
#include "llchat.h"
#include "lldbstrings.h"
#include "lleconomy.h"
#include "llfilepicker.h"
#include "llfocusmgr.h"
#include "llfollowcamparams.h"
#include "llinstantmessage.h"
@@ -64,7 +63,7 @@
#include "llxfermanager.h"
#include "message.h"
#include "sound_ids.h"
#include "lltimer.h"
#include "lleventtimer.h"
#include "llmd5.h"
#include "llagent.h"
@@ -3703,19 +3702,6 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
effectp->setColor(LLColor4U(gAgent.getEffectColor()));
LLHUDManager::getInstance()->sendEffects();
// OGPX : when using agent domain, we get tp finish with ip of 0.0.0.0 and port 0.
// try bailing out early if tp state is PLACE_AVATAR (so legacy should still execute rest of this path)
// not really wild about this, but it's a way to test if we can get TP working w/o receiving TP finish
// TODO: can be removed *when* agent domain no longer sends tp finish
//
// OGPX TODO: see if we can nuke TELEPORT_PLACE_AVATAR state once TeleportFinish is
// completely removed from all SL and OS region code
if (gAgent.getTeleportState() == LLAgent::TELEPORT_PLACE_AVATAR )
{
llinfos << "Got teleport location message when doing agentd TP" << llendl;
return;
}
U32 location_id;
U32 sim_ip;
U16 sim_port;
@@ -3888,10 +3874,8 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
gCacheName->setUpstream(msg->getSender());
gViewerThrottle.sendToSim();
gViewerWindow->sendShapeToSim();
// if this is an AgentMovementComplete message that happened as the result of a teleport,
// then we need to do things like chat the URL and reset the camera.
bool is_teleport = (gAgent.getTeleportState() & (LLAgent::TELEPORT_MOVING | LLAgent::TELEPORT_PLACE_AVATAR)); //OGPX
llinfos << " is_teleport =" << is_teleport << llendl;
bool is_teleport = gAgent.getTeleportState() == LLAgent::TELEPORT_MOVING;
if( is_teleport )
{
@@ -3927,11 +3911,6 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
avatarp->clearChat();
avatarp->slamPosition();
}
// OGPX TODO: remove all usage of TELEPORT_PLACE_AVATAR state once Teleport UDP sequence finalized
if ( gAgent.getTeleportState() == LLAgent::TELEPORT_PLACE_AVATAR ) // unset TP state, agent domain is done. OGPX
{
gAgent.setTeleportState( LLAgent::TELEPORT_NONE );
}
// add teleport destination to the list of visited places
gFloaterTeleportHistory->addPendingEntry(regionp->getName(), (S16)agent_pos.mV[VX], (S16)agent_pos.mV[VY], (S16)agent_pos.mV[VZ]);
@@ -3940,6 +3919,17 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
{
// This is likely just the initial logging in phase.
gAgent.setTeleportState( LLAgent::TELEPORT_NONE );
if(LLStartUp::getStartupState() < STATE_STARTED)
{ // This is initial log-in, not a region crossing:
// Set the camera looking ahead of the AV so send_agent_update() below
// will report the correct location to the server.
LLVector3 look_at_point = look_at;
look_at_point = agent_pos + look_at_point.rotVec(gAgent.getQuat());
static LLVector3 up_direction(0.0f, 0.0f, 1.0f);
LLViewerCamera::getInstance()->lookAt(agent_pos, look_at_point, up_direction);
}
}
if ( LLTracker::isTracking(NULL) )
@@ -4304,7 +4294,6 @@ void process_object_update(LLMessageSystem *mesgsys, void **user_data)
// Update the object...
gObjectList.processObjectUpdate(mesgsys, user_data, OUT_FULL);
stop_glerror();
}
void process_compressed_object_update(LLMessageSystem *mesgsys, void **user_data)
@@ -4322,7 +4311,6 @@ void process_compressed_object_update(LLMessageSystem *mesgsys, void **user_data
// Update the object...
gObjectList.processCompressedObjectUpdate(mesgsys, user_data, OUT_FULL_COMPRESSED);
stop_glerror();
}
void process_cached_object_update(LLMessageSystem *mesgsys, void **user_data)
@@ -4340,7 +4328,6 @@ void process_cached_object_update(LLMessageSystem *mesgsys, void **user_data)
// Update the object...
gObjectList.processCachedObjectUpdate(mesgsys, user_data, OUT_FULL_CACHED);
stop_glerror();
}
@@ -4949,7 +4936,7 @@ void process_avatar_sit_response(LLMessageSystem *mesgsys, void **user_data)
if (object)
{
LLVector3 sit_spot = object->getPositionAgent() + (sitPosition * object->getRotation());
if (!use_autopilot || (avatar && avatar->mIsSitting && avatar->getRoot() == object->getRoot()))
if (!use_autopilot || (avatar && avatar->isSitting() && avatar->getRoot() == object->getRoot()))
{
//we're already sitting on this object, so don't autopilot
}