diff options
author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-04-01 11:32:50 -0700 |
---|---|---|
committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-04-01 11:32:50 -0700 |
commit | 07ff392e8d12214dc23884a092204f00386109a9 (patch) | |
tree | a23e03269da7d99e9882531750d7c17e3e3db868 /indra/llinventory/llparcel.cpp | |
parent | 19c83c67c42305e41bff4b651975671d34a22b55 (diff) | |
parent | bb4836f53d98d987a1702f970d4b853eaa529907 (diff) |
Merge
Diffstat (limited to 'indra/llinventory/llparcel.cpp')
-rw-r--r-- | indra/llinventory/llparcel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp index ec21ae40e7..b08cb28218 100644 --- a/indra/llinventory/llparcel.cpp +++ b/indra/llinventory/llparcel.cpp @@ -452,7 +452,7 @@ BOOL LLParcel::allowTerraformBy(const LLUUID &agent_id) const bool LLParcel::isAgentBlockedFromParcel(LLParcel* parcelp, const LLUUID& agent_id, - const std::vector<LLUUID>& group_ids, + const uuid_vec_t& group_ids, const BOOL is_agent_identified, const BOOL is_agent_transacted, const BOOL is_agent_ageverified) |