diff options
author | Oz Linden <oz@lindenlab.com> | 2011-05-11 13:47:12 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-05-11 13:47:12 -0400 |
commit | 353d2059fc33174010127863a25983b918115361 (patch) | |
tree | f2e08370b140352957b4d7757e59e0fe673f5a14 /indra/newview/llfloaterbuyland.cpp | |
parent | 7610c0c050a84ebdf08b8e206eb7fe5e190dedb2 (diff) | |
parent | d86eb3dd42d39e6b7647b6680100aeafe2173d36 (diff) |
merge up to latest viewer-development
Diffstat (limited to 'indra/newview/llfloaterbuyland.cpp')
-rw-r--r-- | indra/newview/llfloaterbuyland.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/indra/newview/llfloaterbuyland.cpp b/indra/newview/llfloaterbuyland.cpp index 83105ef27c..50b19a4221 100644 --- a/indra/newview/llfloaterbuyland.cpp +++ b/indra/newview/llfloaterbuyland.cpp @@ -459,10 +459,18 @@ void LLFloaterBuyLandUI::updateParcelInfo() return; } - if (!authorizedBuyer.isNull() && buyer != authorizedBuyer) + if (!authorizedBuyer.isNull() && buyer != authorizedBuyer) { - mCannotBuyReason = getString("set_to_sell_to_other"); - return; + // Maybe the parcel is set for sale to a group we are in.
+ bool authorized_group =
+ gAgent.hasPowerInGroup(authorizedBuyer,GP_LAND_DEED)
+ && gAgent.hasPowerInGroup(authorizedBuyer,GP_LAND_SET_SALE_INFO);
+
+ if (!authorized_group)
+ {
+ mCannotBuyReason = getString("set_to_sell_to_other");
+ return;
+ } } } else |