1 files changed, 10 insertions, 3 deletions

diff --git a/linden/indra/newview/lltoolplacer.cpp b/linden/indra/newview/lltoolplacer.cpp
index c031a18..7d6c9e6 100644
--- a/linden/indra/newview/lltoolplacer.cpp
+++ b/linden/indra/newview/lltoolplacer.cpp
@@ -67,6 +67,7 @@
 
 #include "llparcel.h" // RezWithLandGroup
 #include "llviewerparcelmgr.h" // RezWithLandGroup
+#include "roles_constants.h" // Ele: Land Group Override
 
 const LLVector3 DEFAULT_OBJECT_SCALE(0.5f, 0.5f, 0.5f);
 
@@ -264,9 +265,11 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
         gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
         // 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") )
+
+        // Ele: if agent is in land group and has create powers but the tag is not active, force it to enable build seamlessly
+        LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+        if ( gSavedSettings.getBOOL("RezWithLandGroup"))
         {
-                LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
                 if ( gAgent.isInGroup(parcel->getGroupID()) )
                 {
                         gMessageSystem->addUUIDFast(_PREHASH_GroupID, parcel->getGroupID());
@@ -280,7 +283,11 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
                         gMessageSystem->addUUIDFast(_PREHASH_GroupID, gAgent.getGroupID());
                 }
         }
-        else 
+        else if (gAgent.hasPowerInGroup(parcel->getGroupID(), GP_LAND_ALLOW_CREATE) && !parcel->getIsGroupOwned())
+        {
+                gMessageSystem->addUUIDFast(_PREHASH_GroupID, parcel->getGroupID());
+        }
+        else
         {
                 gMessageSystem->addUUIDFast(_PREHASH_GroupID, gAgent.getGroupID());
         }