diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-07-10 09:12:54 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-07-10 09:12:54 -0400 |
| commit | 66bf21c32d64422f9fdc56161acc83b53923735b (patch) | |
| tree | bdd1e565308fb97d7b8b2c97f9cd16489a1b285d /indra/newview/llviewerparcelmgr.h | |
| parent | dc5960d3930efa482b7de205fc9b8d08785da4c8 (diff) | |
| parent | 657944cda7228ba824239d94b270160ac0460934 (diff) | |
merge up to 3.8.0-release (and fix for unit tests with a proxy enabled)'
Diffstat (limited to 'indra/newview/llviewerparcelmgr.h')
| -rwxr-xr-x | indra/newview/llviewerparcelmgr.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelmgr.h b/indra/newview/llviewerparcelmgr.h index b5b269abdf..bb6bbf3308 100755 --- a/indra/newview/llviewerparcelmgr.h +++ b/indra/newview/llviewerparcelmgr.h @@ -218,7 +218,7 @@ public: // Takes an Access List flag, like AL_ACCESS or AL_BAN void sendParcelAccessListUpdate(U32 which); - + // Takes an Access List flag, like AL_ACCESS or AL_BAN void sendParcelAccessListRequest(U32 flags); @@ -291,6 +291,8 @@ public: static BOOL isParcelModifiableByAgent(const LLParcel* parcelp, U64 group_proxy_power); private: + static void sendParcelAccessListUpdate(U32 flags, const std::map<LLUUID, class LLAccessEntry>& entries, LLViewerRegion* region, S32 parcel_local_id); + static void sendParcelExperienceUpdate( const U32 flags, uuid_vec_t experience_ids, LLViewerRegion* region, S32 parcel_local_id ); static bool releaseAlertCB(const LLSD& notification, const LLSD& response); // If the user is claiming land and the current selection |