aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authormingchen2007-12-17 03:49:13 +0000
committermingchen2007-12-17 03:49:13 +0000
commitd845da215f8d30ef3f34a3c207fb892c815d1fac (patch)
treea1714f51422e4b5639d28459569d6235c86751d1 /OpenSim/Region/ClientStack
parentAgain, thanks to Alondria for: (diff)
downloadopensim-SC-d845da215f8d30ef3f34a3c207fb892c815d1fac.zip
opensim-SC-d845da215f8d30ef3f34a3c207fb892c815d1fac.tar.gz
opensim-SC-d845da215f8d30ef3f34a3c207fb892c815d1fac.tar.bz2
opensim-SC-d845da215f8d30ef3f34a3c207fb892c815d1fac.tar.xz
*Land has now been linked to the StorageManager. Next step is to fill in the functions for the different datastore interfaces for Land Objects.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index fd7e04f..d629add 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -136,19 +136,17 @@ namespace OpenSim.Region.ClientStack
136 { 136 {
137 m_log.Verbose("PARCEL", "Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]"); 137 m_log.Verbose("PARCEL", "Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]");
138 scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID; 138 scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;
139 //TODO: Load parcels from storageManager
140 } 139 }
141 else 140 else
142 { 141 {
143 m_log.Verbose("PARCEL", "No master avatar found, using null."); 142 m_log.Verbose("PARCEL", "No master avatar found, using null.");
144 scene.RegionInfo.MasterAvatarAssignedUUID = LLUUID.Zero; 143 scene.RegionInfo.MasterAvatarAssignedUUID = LLUUID.Zero;
145 //TODO: Load parcels from storageManager
146 } 144 }
147 145
148 scene.LandManager.resetSimLandObjects(); 146 scene.LandManager.resetSimLandObjects();
149 147
150 scene.LoadPrimsFromStorage(m_permissions); 148 scene.LoadPrimsFromStorage(m_permissions);
151 149 scene.loadAllLandObjectsFromStorage();
152 scene.performParcelPrimCountUpdate(); 150 scene.performParcelPrimCountUpdate();
153 scene.StartTimer(); 151 scene.StartTimer();
154 return scene; 152 return scene;