Applied Kitty Barnett's RLVa 1.0.1h (Restrained Life) patch.

Made a few non-functional changes to help it apply.

1 files changed, 44 insertions, 0 deletions

diff --git a/linden/indra/newview/llfloaterland.cpp b/linden/indra/newview/llfloaterland.cpp
index 9707184..75c5782 100644
--- a/linden/indra/newview/llfloaterland.cpp
+++ b/linden/indra/newview/llfloaterland.cpp
@@ -813,6 +813,12 @@ void LLPanelLandGeneral::setGroup(const LLUUID& group_id)
 // static
 void LLPanelLandGeneral::onClickBuyLand(void* data)
 {
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )
+        {
+                return;
+        }
+// [/RLVa:KB]
         BOOL* for_group = (BOOL*)data;
         LLViewerParcelMgr::getInstance()->startBuyLand(*for_group);
 }
@@ -2779,3 +2785,41 @@ void LLPanelLandCovenant::updateEstateOwnerName(const std::string& name)
                 if (editor) editor->setText(name);
         }
 }
+
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+void LLFloaterLand::open()
+{
+        // We'll allow "About Land" as long as you have the ability to return prims (through ownership or through group powers)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+        {
+                LLParcelSelection* pParcelSel = LLViewerParcelMgr::getInstance()->getFloatingParcelSelection();
+                if ( (!pParcelSel) || (pParcelSel->hasOthersSelected()) )
+                        return;
+                LLParcel* pParcel = pParcelSel->getParcel();
+                if (!pParcel)
+                        return;
+
+                // Ideally we could just use LLViewerParcelMgr::isParcelOwnedByAgent(), but that has that sneaky exemption
+                // for fake god like (aka View Admin Options)
+                const LLUUID& idOwner = pParcel->getOwnerID();
+                if ( (idOwner != gAgent.getID()) )
+                {
+                        // *sighs* LLAgent::hasPowerInGroup() has it too so copy/paste from there
+                        S32 count = gAgent.mGroups.count(); bool fShow = false;
+                        for (S32 i = 0; i < count; ++i)
+                        {
+                                if (gAgent.mGroups.get(i).mID == idOwner)
+                                {
+                                        fShow |= ((gAgent.mGroups.get(i).mPowers & GP_LAND_RETURN) > 0);
+                                        break;
+                                }
+                        }
+
+                        if (!fShow)
+                                return;
+                }
+        }
+
+        LLFloater::open();
+}
+// [/RLVa:KB]