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

Converted frequently occuring setting lookups to LLCachedControl

Browse Source 
Added LLObjectList::getAvatar(LLUUID) for type-safe and quicker lookup
Added F32 overload to LLSD because using F64 needlessly is silly.
   (And its lack of F32 overload caused issues with LLCachedControl<F32>)
This commit is contained in:
unknown
2010-10-07 21:36:13 -05:00
parent 49e4959bf5
commit fe9a3d2ba2
41 changed files with 365 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llviewermenu.cpp
View File

@@ -2674,9 +2674,9 @@ bool callback_freeze(const LLSD& notification, const LLSD& response)
}
LLMessageSystem* msg = gMessageSystem;
LLViewerObject* avatar = gObjectList.findObject(avatar_id);
LLVOAvatar* avatarp = gObjectList.findAvatar(avatar_id);
if (avatar)
if (avatarp && avatarp->getRegion())
{
msg->newMessage("FreezeUser");
msg->nextBlock("AgentData");
@@ -2685,7 +2685,7 @@ bool callback_freeze(const LLSD& notification, const LLSD& response)
msg->nextBlock("Data");
msg->addUUID("TargetID", avatar_id );
msg->addU32("Flags", flags );
msg->sendReliable( avatar->getRegion()->getHost() );
msg->sendReliable( avatarp->getRegion()->getHost() );
}
}
return false;
@@ -2836,9 +2836,9 @@ bool callback_eject(const LLSD& notification, const LLSD& response)
{
// Eject button
LLMessageSystem* msg = gMessageSystem;
LLViewerObject* avatar = gObjectList.findObject(avatar_id);
LLVOAvatar* avatarp = gObjectList.findAvatar(avatar_id);
if (avatar)
if (avatarp && avatarp->getRegion())
{
U32 flags = 0x0;
msg->newMessage("EjectUser");
@@ -2848,7 +2848,7 @@ bool callback_eject(const LLSD& notification, const LLSD& response)
msg->nextBlock("Data");
msg->addUUID("TargetID", avatar_id );
msg->addU32("Flags", flags );
msg->sendReliable( avatar->getRegion()->getHost() );
msg->sendReliable( avatarp->getRegion()->getHost() );
}
}
else if (ban_enabled)
@@ -2857,9 +2857,9 @@ bool callback_eject(const LLSD& notification, const LLSD& response)
// and it is also not an 'Cancle' button, and ban_enabled==ture,
// it should be the 'Eject and Ban' button.
LLMessageSystem* msg = gMessageSystem;
LLViewerObject* avatar = gObjectList.findObject(avatar_id);
LLVOAvatar* avatarp = gObjectList.findAvatar(avatar_id);
if (avatar)
if (avatarp && avatarp->getRegion())
{
U32 flags = 0x1;
msg->newMessage("EjectUser");
@@ -2869,7 +2869,7 @@ bool callback_eject(const LLSD& notification, const LLSD& response)
msg->nextBlock("Data");
msg->addUUID("TargetID", avatar_id );
msg->addU32("Flags", flags );
msg->sendReliable( avatar->getRegion()->getHost() );
msg->sendReliable( avatarp->getRegion()->getHost() );
}
}
return false;
@@ -5494,7 +5494,7 @@ void print_agent_nvpairs(void*)
llinfos << "Agent Name Value Pairs" << llendl;
objectp = gObjectList.findObject(gAgentID);
objectp = gAgent.getAvatarObject();
if (objectp)
{
objectp->printNameValuePairs();