4 files changed, 68 insertions, 4 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 8984e04..9f2854b 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -37,6 +37,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>RezWithLandGroup</key>
+  <map>
+    <key>Comment</key>
+    <string>Attempts to rez objects in the lands group if you're apart of it</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>ShadowsEnabled</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp
index aa5bfad..a3ed16b 100644
--- a/linden/indra/newview/lltooldraganddrop.cpp
+++ b/linden/indra/newview/lltooldraganddrop.cpp
@@ -69,6 +69,9 @@
 #include "object_flags.h"
 #include "llimview.h"
 
+#include "llparcel.h" // RezWithLandGroup
+#include "llviewerparcelmgr.h" // RezWithLandGroup
+
 
 // MAX ITEMS is based on (sizeof(uuid)+2) * count must be < MTUBYTES
 // or 18 * count < 1200 => count < 1200/18 => 66. I've cut it down a
@@ -1357,6 +1360,29 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target,
         msg->addUUIDFast(_PREHASH_SessionID,  gAgent.getSessionID());
         msg->addUUIDFast(_PREHASH_GroupID, gAgent.getGroupID());
 
+        // RezWithLandGroup 2009-05, If avatar is in land group/land owner group,
+        //it rezzes it with it to prevent autoreturn/whatever...
+        if ( gSavedSettings.getBOOL("RezWithLandGroup") )
+        {
+                LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+                if ( gAgent.isInGroup(parcel->getGroupID()) )
+                {
+                        msg->addUUIDFast(_PREHASH_GroupID, parcel->getGroupID());
+                }
+                else if ( gAgent.isInGroup(parcel->getOwnerID()) )
+                {
+                        msg->addUUIDFast(_PREHASH_GroupID, parcel->getOwnerID());
+                }
+                else 
+                {
+                        msg->addUUIDFast(_PREHASH_GroupID, gAgent.getGroupID());
+                }
+        }
+        else 
+        {
+                msg->addUUIDFast(_PREHASH_GroupID, gAgent.getGroupID());
+        }
+
         msg->nextBlock("RezData");
         // if it's being rezzed from task inventory, we need to enable
         // saving it back into the task inventory.
diff --git a/linden/indra/newview/lltoolplacer.cpp b/linden/indra/newview/lltoolplacer.cpp
index 84e0203..d52d97c 100644
--- a/linden/indra/newview/lltoolplacer.cpp
+++ b/linden/indra/newview/lltoolplacer.cpp
@@ -65,6 +65,9 @@
 #include "llviewercamera.h"
 #include "llviewerstats.h"
 
+#include "llparcel.h" // RezWithLandGroup
+#include "llviewerparcelmgr.h" // RezWithLandGroup
+
 const LLVector3 DEFAULT_OBJECT_SCALE(0.5f, 0.5f, 0.5f);
 
 //static 
@@ -255,7 +258,28 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
         gMessageSystem->nextBlockFast(_PREHASH_AgentData);
         gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
         gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-        gMessageSystem->addUUIDFast(_PREHASH_GroupID, gAgent.getGroupID());
+        // RezWithLandGroup 2009-05, If avatar is in land group/land owner group,
+        // it rezzes it with it to prevent autoreturn/whatever
+        if ( gSavedSettings.getBOOL("RezWithLandGroup") )
+        {
+                LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+                if ( gAgent.isInGroup(parcel->getGroupID()) )
+                {
+                        gMessageSystem->addUUIDFast(_PREHASH_GroupID, parcel->getGroupID());
+                }
+                else if ( gAgent.isInGroup(parcel->getOwnerID()) )
+                {
+                        gMessageSystem->addUUIDFast(_PREHASH_GroupID, parcel->getOwnerID());
+                }
+                else 
+                {
+                        gMessageSystem->addUUIDFast(_PREHASH_GroupID, gAgent.getGroupID());
+                }
+        }
+        else 
+        {
+                gMessageSystem->addUUIDFast(_PREHASH_GroupID, gAgent.getGroupID());
+        }
         gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
         gMessageSystem->addU8Fast(_PREHASH_Material,    material);
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml b/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
index 807caa0..6e6e65c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-297" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" follows="right" height="151" left="298" min_height="151"
-     min_width="272" mouse_opaque="true" name="build options floater"
-     rect_control="FloaterBuildOptionsRect" title="Grid Options" width="272">
+     can_resize="false" follows="right" height="165" min_height="165"
+     min_width="320" mouse_opaque="true" name="build options floater"
+     rect_control="FloaterBuildOptionsRect" title="Grid Options" width="320">
         <spinner bottom="-53" control_name="GridResolution" decimal_digits="3"
              follows="left|top" height="16" increment="0.1" initial_val="1"
              label="Grid Unit (meters)" label_width="110" left="14" max_val="5"
@@ -24,4 +24,7 @@
              initial_val="0.7" label="Grid Opacity" left="14" max_val="1" min_val="0"
              mouse_opaque="true" name="GridOpacity" show_text="false" value="0.7"
              width="200" />
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+                         label="Rez objects under the land group when possible" left_delta="0" mouse_opaque="true"
+                         name="grouplandrez" radio_style="false" width="270" control_name="RezWithLandGroup"/>
 </floater>