aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
authormingchen2007-07-16 19:40:25 +0000
committermingchen2007-07-16 19:40:25 +0000
commit2873b82b788244852fd1dad3a747f3ba33a73be5 (patch)
tree1a447a3e880743860a7fb4e4f726fedf816bf9d6 /OpenSim/Region/Application/OpenSimMain.cs
parent*Renamed ParcelManager to LandManager (diff)
downloadopensim-SC-2873b82b788244852fd1dad3a747f3ba33a73be5.zip
opensim-SC-2873b82b788244852fd1dad3a747f3ba33a73be5.tar.gz
opensim-SC-2873b82b788244852fd1dad3a747f3ba33a73be5.tar.bz2
opensim-SC-2873b82b788244852fd1dad3a747f3ba33a73be5.tar.xz
*Renamed everything Parcels and ParcelData to Land and LandData
*Added missing files (I hope)
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 4e10955..368af12 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.LandManager); 243 scene.localStorage.LoadLandObjects((ILocalStorageLandObjectReceiver)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.LandManager); 249 scene.localStorage.LoadLandObjects((ILocalStorageLandObjectReceiver)scene.LandManager);
250 } 250 }
251 scene.performParcelPrimCountUpdate(); 251 scene.performParcelPrimCountUpdate();
252 scene.StartTimer(); 252 scene.StartTimer();