diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-07-07 17:06:09 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-07-07 17:06:09 -0400 |
| commit | f7d94905db3f39785863b91f75daf612dc6c3c48 (patch) | |
| tree | ca958ce0a621c0ed8012336fbdb03867409c1f17 /indra/newview/llfloaterauction.h | |
| parent | fa1913ea679fd895d709da5c5782b26c7d03a40a (diff) | |
| parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) | |
merge changes for 3.8.0-release
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: |