livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed line endings.

meow-7.2.2
ziree 2011-05-03 16:36:40 +02:00
parent 85fb073b33
commit ea8f4419ad
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/lltooldraganddrop.cpp
View File

@ -1225,19 +1225,19 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target,
msg->nextBlockFast(_PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
LLUUID group_id = gAgent.getGroupID();
if (gSavedSettings.getBOOL("RezUnderLandGroup"))
{
LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
if (gAgent.isInGroup(parcel->getGroupID()))
{
group_id = parcel->getGroupID();
}
else if (gAgent.isInGroup(parcel->getOwnerID()))
{
group_id = parcel->getOwnerID();
}
}
LLUUID group_id = gAgent.getGroupID();
if (gSavedSettings.getBOOL("RezUnderLandGroup"))
{
LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
if (gAgent.isInGroup(parcel->getGroupID()))
{
group_id = parcel->getGroupID();
}
else if (gAgent.isInGroup(parcel->getOwnerID()))
{
group_id = parcel->getOwnerID();
}
}
msg->addUUIDFast(_PREHASH_GroupID, group_id);
msg->nextBlock("RezData");