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

Merge branch 'curlthreading2' into curlthreading3

Browse Source
This commit is contained in:
Aleric Inglewood
2012-09-06 15:12:22 +02:00
parent 83b13f6a3f e3752aefed
commit e7cd445491
4070 changed files with 25269 additions and 20661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
indra/newview/llagent.cpp
View File

@@ -36,6 +36,7 @@
#include "llagentui.h"
#include "llanimationstates.h"
#include "llcallingcard.h"
#include "llcapabilitylistener.h"
#include "llconsole.h"
#include "llenvmanager.h"
#include "llfirstuse.h"
@@ -70,6 +71,7 @@
#include "llviewermenu.h"
#include "llviewerobjectlist.h"
#include "llviewerparcelmgr.h"
#include "llviewerregion.h"
#include "llviewerstats.h"
#include "llviewerwindow.h"
#include "llvoavatarself.h"
@@ -77,21 +79,20 @@
#include "llworldmap.h"
//Misc non-standard includes
#include "llviewerregion.h"
#include "llurldispatcher.h"
#include "llimview.h" //For gIMMgr
//Floaters
#include "llfloatermute.h"
#include "llfloatermap.h"
#include "llfloateractivespeakers.h"
#include "llfloateravatarinfo.h"
#include "llfloaterchat.h"
#include "llfloaterdirectory.h"
#include "llfloatergroupinfo.h"
#include "llfloatergroups.h"
#include "llfloateravatarinfo.h"
#include "llfloaterworldmap.h"
#include "llfloaterland.h"
#include "llfloatermap.h"
#include "llfloatermute.h"
#include "llfloatersnapshot.h"
#include "llfloaterchat.h"
#include "llfloaterworldmap.h"
#include "lluictrlfactory.h" //For LLUICtrlFactory::getLayeredXMLNode
@@ -121,7 +122,6 @@ const F64 CHAT_AGE_FAST_RATE = 3.0;
const F32 MIN_FIDGET_TIME = 8.f; // seconds
const F32 MAX_FIDGET_TIME = 20.f; // seconds
// The agent instance.
LLAgent gAgent;
std::string gAuthString;
@@ -130,7 +130,7 @@ std::string gAuthString;
LLUUID gReSitTargetID;
LLVector3 gReSitOffset;
// </edit>
//
//--------------------------------------------------------------------
// Statics
//
@@ -247,6 +247,7 @@ LLAgent::LLAgent() :
mFirstLogin(FALSE),
mGenderChosen(FALSE),
mAppearanceSerialNum(0),
mMouselookModeInSignal(NULL),
mMouselookModeOutSignal(NULL),
mPendingLure(NULL)
@@ -310,7 +311,6 @@ LLAgent::~LLAgent()
mEffectColor = NULL;
}
// Handle any actions that need to be performed when the main app gains focus
// (such as through alt-tab).
//-----------------------------------------------------------------------------
@@ -481,7 +481,7 @@ void LLAgent::movePitch(F32 mag)
if (mag > 0)
{
setControlFlags(AGENT_CONTROL_PITCH_POS );
setControlFlags(AGENT_CONTROL_PITCH_POS);
}
else if (mag < 0)
{
@@ -535,8 +535,6 @@ BOOL LLAgent::getPhantom()
return exlPhantom;
}
//
//-----------------------------------------------------------------------------
// setFlying()
//-----------------------------------------------------------------------------
@@ -665,9 +663,9 @@ void LLAgent::setRegion(LLViewerRegion *regionp)
<< " located at " << ip << llendl;
if (mRegionp)
{
// NaCl - Antispam Registry
NACLAntiSpamRegistry::purgeAllQueues();
// NaCl End
// NaCl - Antispam Registry
NACLAntiSpamRegistry::purgeAllQueues();
// NaCl End
// We've changed regions, we're now going to change our agent coordinate frame.
mAgentOriginGlobal = regionp->getOriginGlobal();
@@ -1713,7 +1711,6 @@ void LLAgent::updateAgentPosition(const F32 dt, const F32 yaw_radians, const S32
gAgentCamera.updateLookAt(mouse_x, mouse_y);
}
// friends and operators
std::ostream& operator<<(std::ostream &s, const LLAgent &agent)
@@ -2201,6 +2198,33 @@ void LLAgent::setStartPosition( U32 location_id )
}
}
struct HomeLocationMapper: public LLCapabilityListener::CapabilityMapper
{
// No reply message expected
HomeLocationMapper(): LLCapabilityListener::CapabilityMapper("HomeLocation") {}
virtual void buildMessage(LLMessageSystem* msg,
const LLUUID& agentID,
const LLUUID& sessionID,
const std::string& capabilityName,
const LLSD& payload) const
{
msg->newMessageFast(_PREHASH_SetStartLocationRequest);
msg->nextBlockFast( _PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID, agentID);
msg->addUUIDFast(_PREHASH_SessionID, sessionID);
msg->nextBlockFast( _PREHASH_StartLocationData);
// corrected by sim
msg->addStringFast(_PREHASH_SimName, "");
msg->addU32Fast(_PREHASH_LocationID, payload["HomeLocation"]["LocationId"].asInteger());
msg->addVector3Fast(_PREHASH_LocationPos,
ll_vector3_from_sdmap(payload["HomeLocation"]["LocationPos"]));
msg->addVector3Fast(_PREHASH_LocationLookAt,
ll_vector3_from_sdmap(payload["HomeLocation"]["LocationLookAt"]));
}
};
// Need an instance of this class so it will self-register
static HomeLocationMapper homeLocationMapper;
void LLAgent::requestStopMotion( LLMotion* motion )
{
// Notify all avatars that a motion has stopped.
@@ -2372,7 +2396,7 @@ bool LLAgent::sendMaturityPreferenceToServer(int preferredMaturity)
{
access_prefs["max"] = "A";
}
LLSD body = LLSD::emptyMap();
body["access_prefs"] = access_prefs;
llinfos << "Sending access prefs update to " << (access_prefs["max"].asString()) << " via capability to: "
@@ -2782,7 +2806,6 @@ BOOL LLAgent::allowOperation(PermissionBit op,
return perm.allowOperationBy(op, agent_proxy, group_proxy);
}
void LLAgent::getName(std::string& name)
{
name.clear();
@@ -3470,7 +3493,7 @@ bool LLAgent::teleportCore(bool is_local)
// hide land floater too - it'll be out of date
LLFloaterLand::hideInstance();
LLViewerParcelMgr::getInstance()->deselectLand();
LLViewerMediaFocus::getInstance()->setFocusFace(false, NULL, 0, NULL);
@@ -3728,8 +3751,7 @@ void LLAgent::setTeleportState(ETeleportState state)
}
switch (mTeleportState)
{
{
case TELEPORT_NONE:
mbTeleportKeepsLookAt = false;
break;
@@ -3996,10 +4018,10 @@ void LLAgent::sendAgentSetAppearance()
break;
}
msg->nextBlockFast(_PREHASH_VisualParam );
// We don't send the param ids. Instead, we assume that the receiver has the same params in the same sequence.
const F32 param_value = param->getWeight();
const U8 new_weight = F32_to_U8(param_value, param->getMinWeight(), param->getMaxWeight());
msg->addU8Fast(_PREHASH_ParamValue, new_weight );
transmitted_params++;
}
@@ -4016,7 +4038,7 @@ void LLAgent::sendAgentDataUpdateRequest()
{
gMessageSystem->newMessageFast(_PREHASH_AgentDataUpdateRequest);
gMessageSystem->nextBlockFast(_PREHASH_AgentData);
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
sendReliableMessage();
}
@@ -4208,4 +4230,3 @@ LLAgentQueryManager::~LLAgentQueryManager()
}
// EOF