diff options
author | callum_linden <none@none> | 2015-07-02 09:40:49 -0700 |
---|---|---|
committer | callum_linden <none@none> | 2015-07-02 09:40:49 -0700 |
commit | 71406f1af805d0b88e348b81a67bcde3d0b3d885 (patch) | |
tree | 9eab3e24208d2aecedf29eed0eebb6f209197475 /indra/newview/llfloaterauction.h | |
parent | d89b4109f9ac3f1ef95480823df292bbc8200347 (diff) | |
parent | 8eb7e9d9522f598321e1f8cba5ab8166a52c5bcb (diff) |
Merge with head
Diffstat (limited to 'indra/newview/llfloaterauction.h')
-rwxr-xr-x | indra/newview/llfloaterauction.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterauction.h b/indra/newview/llfloaterauction.h index 9c0c0f7775..c83a11ba8b 100755 --- a/indra/newview/llfloaterauction.h +++ b/indra/newview/llfloaterauction.h @@ -67,7 +67,7 @@ private: void doResetParcel(); void doSellToAnyone(); - void clearParcelAccessLists( LLParcel* parcel, LLViewerRegion* region ); + void clearParcelAccessList( LLParcel* parcel, LLViewerRegion* region, U32 list); void cleanupAndClose(); private: |