diff options
author | mingchen | 2007-07-16 18:45:19 +0000 |
---|---|---|
committer | mingchen | 2007-07-16 18:45:19 +0000 |
commit | 7fabf9612a539e96c67a7e6a460f200d20cfeff6 (patch) | |
tree | 45a10ed5ba61dfc1d96d9840e1fbef84c195edfd /OpenSim/Region/Application | |
parent | * Since we're discussing it, applying the m_ convention on some members... (diff) | |
download | opensim-SC-7fabf9612a539e96c67a7e6a460f200d20cfeff6.zip opensim-SC-7fabf9612a539e96c67a7e6a460f200d20cfeff6.tar.gz opensim-SC-7fabf9612a539e96c67a7e6a460f200d20cfeff6.tar.bz2 opensim-SC-7fabf9612a539e96c67a7e6a460f200d20cfeff6.tar.xz |
*Renamed ParcelManager to LandManager
*Made the Parcel class its own file and moved the Parcel and LandManager into their own folder in Environment
*Some renaming might need to be done so the Parcel class doesn't have issues with the libsecondlife Parcel class, but Land doesn't seem right.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 05ccbc3..4e10955 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -240,13 +240,13 @@ namespace OpenSim | |||
240 | { | 240 | { |
241 | m_log.Notice("Parcels - Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]"); | 241 | m_log.Notice("Parcels - Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]"); |
242 | scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID; | 242 | scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID; |
243 | scene.localStorage.LoadParcels((ILocalStorageParcelReceiver)scene.ParcelManager); | 243 | scene.localStorage.LoadParcels((ILocalStorageParcelReceiver)scene.LandManager); |
244 | } | 244 | } |
245 | else | 245 | else |
246 | { | 246 | { |
247 | m_log.Notice("Parcels - No master avatar found, using null."); | 247 | m_log.Notice("Parcels - No master avatar found, using null."); |
248 | scene.RegionInfo.MasterAvatarAssignedUUID = libsecondlife.LLUUID.Zero; | 248 | scene.RegionInfo.MasterAvatarAssignedUUID = libsecondlife.LLUUID.Zero; |
249 | scene.localStorage.LoadParcels((ILocalStorageParcelReceiver)scene.ParcelManager); | 249 | scene.localStorage.LoadParcels((ILocalStorageParcelReceiver)scene.LandManager); |
250 | } | 250 | } |
251 | scene.performParcelPrimCountUpdate(); | 251 | scene.performParcelPrimCountUpdate(); |
252 | scene.StartTimer(); | 252 | scene.StartTimer(); |