diff options
| author | Melanie | 2011-01-28 02:36:20 +0000 |
|---|---|---|
| committer | Melanie | 2011-01-28 02:36:20 +0000 |
| commit | 3f200da8781a91ced8733bd4bac3ee17ae2de518 (patch) | |
| tree | 5a28bcf8726927dbaafd659a36f70e490aaea99b /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-3f200da8781a91ced8733bd4bac3ee17ae2de518.zip opensim-SC_OLD-3f200da8781a91ced8733bd4bac3ee17ae2de518.tar.gz opensim-SC_OLD-3f200da8781a91ced8733bd4bac3ee17ae2de518.tar.bz2 opensim-SC_OLD-3f200da8781a91ced8733bd4bac3ee17ae2de518.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/LandData.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs index 3fb2fd6..0389a2d 100644 --- a/OpenSim/Framework/LandData.cs +++ b/OpenSim/Framework/LandData.cs | |||
| @@ -697,6 +697,8 @@ namespace OpenSim.Framework | |||
| 697 | landData._mediaLoop = _mediaLoop; | 697 | landData._mediaLoop = _mediaLoop; |
| 698 | landData._obscureMusic = _obscureMusic; | 698 | landData._obscureMusic = _obscureMusic; |
| 699 | landData._obscureMedia = _obscureMedia; | 699 | landData._obscureMedia = _obscureMedia; |
| 700 | landData._simwideArea = _simwideArea; | ||
| 701 | landData._simwidePrims = _simwidePrims; | ||
| 700 | 702 | ||
| 701 | landData._parcelAccessList.Clear(); | 703 | landData._parcelAccessList.Clear(); |
| 702 | foreach (ParcelManager.ParcelAccessEntry entry in _parcelAccessList) | 704 | foreach (ParcelManager.ParcelAccessEntry entry in _parcelAccessList) |