1 files changed, 14 insertions, 8 deletions

diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index 61b91fe..257ce0d 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -651,15 +651,21 @@ BOOL LLViewerParcelMgr::agentCanBuild() const
 {
         if (mAgentParcel)
         {
-                return (gAgent.isGodlike()
-                                || (mAgentParcel->allowModifyBy(
-                                                gAgent.getID(),
-                                                gAgent.getGroupID())));
-        }
-        else
-        {
-                return gAgent.isGodlike();
+                const LLUUID parcel_group = mAgentParcel->getGroupID();
+                const LLUUID active_group = gAgent.getGroupID();
+
+                if (gAgent.isGodlike())
+                        return true;
+
+                if (mAgentParcel->allowModifyBy(gAgent.getID(), active_group))
+                        return true;
+
+                // Ele: enable build option if we are in the land group and we have create powers, even if the group tag is not active
+                if (gAgent.isInGroup(parcel_group) && gAgent.hasPowerInGroup(parcel_group, GP_LAND_ALLOW_CREATE))
+                        return true;
         }
+
+        return gAgent.isGodlike();
 }
 
 BOOL LLViewerParcelMgr::agentCanTakeDamage() const