diff options
| author | Tom | 2011-09-14 18:46:42 -0700 |
|---|---|---|
| committer | Tom | 2011-09-14 18:46:42 -0700 |
| commit | cda4cd6b551156ed503a5f284ad6c5a9a0e1c5a5 (patch) | |
| tree | f6b8e5a8dbe7d00c1ac1ba1c830c0f8cea4e1325 /OpenSim/Region/CoreModules/World/Land | |
| parent | First set of merge fixes (diff) | |
| download | opensim-SC-cda4cd6b551156ed503a5f284ad6c5a9a0e1c5a5.zip opensim-SC-cda4cd6b551156ed503a5f284ad6c5a9a0e1c5a5.tar.gz opensim-SC-cda4cd6b551156ed503a5f284ad6c5a9a0e1c5a5.tar.bz2 opensim-SC-cda4cd6b551156ed503a5f284ad6c5a9a0e1c5a5.tar.xz | |
Merge fixes, and fix the build
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index a3066e7..474905a 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
| @@ -96,6 +96,8 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 96 | 96 | ||
| 97 | // caches ExtendedLandData | 97 | // caches ExtendedLandData |
| 98 | private Cache parcelInfoCache; | 98 | private Cache parcelInfoCache; |
| 99 | private Dictionary<UUID, Vector3> forcedPosition = | ||
| 100 | new Dictionary<UUID, Vector3>(); | ||
| 99 | 101 | ||
| 100 | #region INonSharedRegionModule Members | 102 | #region INonSharedRegionModule Members |
| 101 | 103 | ||