diff options
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/LandManagement/LandManager.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 8 |
2 files changed, 8 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/LandManagement/LandManager.cs b/OpenSim/Region/Environment/LandManagement/LandManager.cs index bdb50cc..155c91f 100644 --- a/OpenSim/Region/Environment/LandManagement/LandManager.cs +++ b/OpenSim/Region/Environment/LandManagement/LandManager.cs | |||
@@ -127,7 +127,7 @@ namespace OpenSim.Region.Environment.LandManagement | |||
127 | } | 127 | } |
128 | catch (Exception ex) | 128 | catch (Exception ex) |
129 | { | 129 | { |
130 | MainLog.Instance.Verbose("LandManager", "IncomingLandObjectsFromStorage: Exception: " + ex.ToString() ); | 130 | MainLog.Instance.Error("LandManager", "IncomingLandObjectsFromStorage: Exception: " + ex.ToString()); |
131 | } | 131 | } |
132 | } | 132 | } |
133 | //foreach (LandData parcel in data) | 133 | //foreach (LandData parcel in data) |
@@ -178,12 +178,14 @@ namespace OpenSim.Region.Environment.LandManagement | |||
178 | public Land addLandObject(Land new_land) | 178 | public Land addLandObject(Land new_land) |
179 | { | 179 | { |
180 | // TODO: REMOVE (TEDD) | 180 | // TODO: REMOVE (TEDD) |
181 | Console.WriteLine("addLandObject()"); | 181 | MainLog.Instance.Verbose("LandManager", "addLandObject()"); |
182 | lastLandLocalID++; | 182 | lastLandLocalID++; |
183 | new_land.landData.localID = lastLandLocalID; | 183 | new_land.landData.localID = lastLandLocalID; |
184 | landList.Add(lastLandLocalID, new_land.Copy()); | 184 | landList.Add(lastLandLocalID, new_land.Copy()); |
185 | 185 | ||
186 | 186 | ||
187 | // TODO: REMOVE (TEDD) | ||
188 | MainLog.Instance.Verbose("LandManager", "new_land.getLandBitmap()"); | ||
187 | bool[,] landBitmap = new_land.getLandBitmap(); | 189 | bool[,] landBitmap = new_land.getLandBitmap(); |
188 | int x, y; | 190 | int x, y; |
189 | for (x = 0; x < 64; x++) | 191 | for (x = 0; x < 64; x++) |
@@ -196,8 +198,12 @@ namespace OpenSim.Region.Environment.LandManagement | |||
196 | } | 198 | } |
197 | } | 199 | } |
198 | } | 200 | } |
201 | // TODO: REMOVE (TEDD) | ||
202 | MainLog.Instance.Verbose("LandManager", "forceUpdateLandInfo()"); | ||
199 | landList[lastLandLocalID].forceUpdateLandInfo(); | 203 | landList[lastLandLocalID].forceUpdateLandInfo(); |
204 | MainLog.Instance.Verbose("LandManager", "TriggerLandObjectAdded"); | ||
200 | m_scene.EventManager.TriggerLandObjectAdded(new_land, m_scene.RegionInfo.RegionID); | 205 | m_scene.EventManager.TriggerLandObjectAdded(new_land, m_scene.RegionInfo.RegionID); |
206 | MainLog.Instance.Verbose("LandManager", "end of addLandObject()"); | ||
201 | return new_land; | 207 | return new_land; |
202 | } | 208 | } |
203 | 209 | ||
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index f3564d1..9e13fe7 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -900,24 +900,16 @@ namespace OpenSim.Region.Environment.Scenes | |||
900 | public void loadAllLandObjectsFromStorage() | 900 | public void loadAllLandObjectsFromStorage() |
901 | { | 901 | { |
902 | MainLog.Instance.Verbose("SCENE", "Loading land objects from storage"); | 902 | MainLog.Instance.Verbose("SCENE", "Loading land objects from storage"); |
903 | // TODO: REMOVE (TEDD) | ||
904 | MainLog.Instance.Verbose("SCENE", "LandObjLoad debug: DataStore.LoadLandObjects"); | ||
905 | List<LandData> landData = m_storageManager.DataStore.LoadLandObjects(RegionInfo.RegionID); | 903 | List<LandData> landData = m_storageManager.DataStore.LoadLandObjects(RegionInfo.RegionID); |
906 | 904 | ||
907 | if (landData.Count == 0) | 905 | if (landData.Count == 0) |
908 | { | 906 | { |
909 | // TODO: REMOVE (TEDD) | ||
910 | MainLog.Instance.Verbose("SCENE", "LandObjLoad debug: NoLandDataFromStorage()"); | ||
911 | m_LandManager.NoLandDataFromStorage(); | 907 | m_LandManager.NoLandDataFromStorage(); |
912 | } | 908 | } |
913 | else | 909 | else |
914 | { | 910 | { |
915 | // TODO: REMOVE (TEDD) | ||
916 | MainLog.Instance.Verbose("SCENE", "LandObjLoad debug: IncomingLandObjectsFromStorage(landData)"); | ||
917 | m_LandManager.IncomingLandObjectsFromStorage(landData); | 911 | m_LandManager.IncomingLandObjectsFromStorage(landData); |
918 | } | 912 | } |
919 | // TODO: REMOVE (TEDD) | ||
920 | MainLog.Instance.Verbose("SCENE", "Done loading land objects from storage"); | ||
921 | } | 913 | } |
922 | 914 | ||
923 | #endregion | 915 | #endregion |