From ea8f4419ad2178da5301e83dc5b236bcca32f767 Mon Sep 17 00:00:00 2001 From: ziree Date: Tue, 3 May 2011 16:36:40 +0200 Subject: [PATCH] Fixed line endings. --- indra/newview/lltooldraganddrop.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index c351ff430c..fad738760a 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -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");