Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2011-01-28 02:36:20 +00:00
6 changed files with 85 additions and 39 deletions

View File

@@ -697,6 +697,8 @@ namespace OpenSim.Framework
landData._mediaLoop = _mediaLoop;
landData._obscureMusic = _obscureMusic;
landData._obscureMedia = _obscureMedia;
landData._simwideArea = _simwideArea;
landData._simwidePrims = _simwidePrims;
landData._parcelAccessList.Clear();
foreach (ParcelManager.ParcelAccessEntry entry in _parcelAccessList)