diff options
author | Tedd Hansen | 2008-01-19 20:45:09 +0000 |
---|---|---|
committer | Tedd Hansen | 2008-01-19 20:45:09 +0000 |
commit | 4ab19afc0a599a575baeab3a06872804b3f5108e (patch) | |
tree | 323845175df6d275b106c8b8350ebba6118a102a /OpenSim/Region/Environment | |
parent | checking return code may make failed teleports fail more gracefully. (diff) | |
download | opensim-SC_OLD-4ab19afc0a599a575baeab3a06872804b3f5108e.zip opensim-SC_OLD-4ab19afc0a599a575baeab3a06872804b3f5108e.tar.gz opensim-SC_OLD-4ab19afc0a599a575baeab3a06872804b3f5108e.tar.bz2 opensim-SC_OLD-4ab19afc0a599a575baeab3a06872804b3f5108e.tar.xz |
More debugging
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/LandManagement/Land.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/LandManagement/LandManager.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 4 |
3 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/LandManagement/Land.cs b/OpenSim/Region/Environment/LandManagement/Land.cs index 5c99ffd..c23d7c7 100644 --- a/OpenSim/Region/Environment/LandManagement/Land.cs +++ b/OpenSim/Region/Environment/LandManagement/Land.cs | |||
@@ -446,6 +446,8 @@ namespace OpenSim.Region.Environment.LandManagement | |||
446 | /// </summary> | 446 | /// </summary> |
447 | public void forceUpdateLandInfo() | 447 | public void forceUpdateLandInfo() |
448 | { | 448 | { |
449 | // TODO: REMOVE (TEDD) | ||
450 | Console.WriteLine("addLandObject()"); | ||
449 | updateAABBAndAreaValues(); | 451 | updateAABBAndAreaValues(); |
450 | updateLandBitmapByteArray(); | 452 | updateLandBitmapByteArray(); |
451 | } | 453 | } |
diff --git a/OpenSim/Region/Environment/LandManagement/LandManager.cs b/OpenSim/Region/Environment/LandManagement/LandManager.cs index 3969932..3bd8848 100644 --- a/OpenSim/Region/Environment/LandManagement/LandManager.cs +++ b/OpenSim/Region/Environment/LandManagement/LandManager.cs | |||
@@ -127,9 +127,17 @@ namespace OpenSim.Region.Environment.LandManagement | |||
127 | 127 | ||
128 | public void IncomingLandObjectFromStorage(LandData data) | 128 | public void IncomingLandObjectFromStorage(LandData data) |
129 | { | 129 | { |
130 | // TODO: REMOVE (TEDD) | ||
131 | MainLog.Instance.Verbose("LandManager", "IncomingLandObjectFromStorage: " + data.localID); | ||
130 | Land new_land = new Land(data.ownerID, data.isGroupOwned, m_scene); | 132 | Land new_land = new Land(data.ownerID, data.isGroupOwned, m_scene); |
133 | // TODO: REMOVE (TEDD) | ||
134 | MainLog.Instance.Verbose("LandManager", "IncomingLandObjectFromStorage: data.Copy()"); | ||
131 | new_land.landData = data.Copy(); | 135 | new_land.landData = data.Copy(); |
136 | // TODO: REMOVE (TEDD) | ||
137 | MainLog.Instance.Verbose("LandManager", "IncomingLandObjectFromStorage: new_land.setLandBitmapFromByteArray()"); | ||
132 | new_land.setLandBitmapFromByteArray(); | 138 | new_land.setLandBitmapFromByteArray(); |
139 | // TODO: REMOVE (TEDD) | ||
140 | MainLog.Instance.Verbose("LandManager", "IncomingLandObjectFromStorage: addLandObject(new_land)"); | ||
133 | addLandObject(new_land); | 141 | addLandObject(new_land); |
134 | } | 142 | } |
135 | 143 | ||
@@ -158,6 +166,8 @@ namespace OpenSim.Region.Environment.LandManagement | |||
158 | /// <param name="new_land">The land object being added</param> | 166 | /// <param name="new_land">The land object being added</param> |
159 | public Land addLandObject(Land new_land) | 167 | public Land addLandObject(Land new_land) |
160 | { | 168 | { |
169 | // TODO: REMOVE (TEDD) | ||
170 | Console.WriteLine("addLandObject()"); | ||
161 | lastLandLocalID++; | 171 | lastLandLocalID++; |
162 | new_land.landData.localID = lastLandLocalID; | 172 | new_land.landData.localID = lastLandLocalID; |
163 | landList.Add(lastLandLocalID, new_land.Copy()); | 173 | landList.Add(lastLandLocalID, new_land.Copy()); |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index e84a24e..f3564d1 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -900,19 +900,23 @@ 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) | ||
903 | MainLog.Instance.Verbose("SCENE", "LandObjLoad debug: DataStore.LoadLandObjects"); | 904 | MainLog.Instance.Verbose("SCENE", "LandObjLoad debug: DataStore.LoadLandObjects"); |
904 | List<LandData> landData = m_storageManager.DataStore.LoadLandObjects(RegionInfo.RegionID); | 905 | List<LandData> landData = m_storageManager.DataStore.LoadLandObjects(RegionInfo.RegionID); |
905 | 906 | ||
906 | if (landData.Count == 0) | 907 | if (landData.Count == 0) |
907 | { | 908 | { |
909 | // TODO: REMOVE (TEDD) | ||
908 | MainLog.Instance.Verbose("SCENE", "LandObjLoad debug: NoLandDataFromStorage()"); | 910 | MainLog.Instance.Verbose("SCENE", "LandObjLoad debug: NoLandDataFromStorage()"); |
909 | m_LandManager.NoLandDataFromStorage(); | 911 | m_LandManager.NoLandDataFromStorage(); |
910 | } | 912 | } |
911 | else | 913 | else |
912 | { | 914 | { |
915 | // TODO: REMOVE (TEDD) | ||
913 | MainLog.Instance.Verbose("SCENE", "LandObjLoad debug: IncomingLandObjectsFromStorage(landData)"); | 916 | MainLog.Instance.Verbose("SCENE", "LandObjLoad debug: IncomingLandObjectsFromStorage(landData)"); |
914 | m_LandManager.IncomingLandObjectsFromStorage(landData); | 917 | m_LandManager.IncomingLandObjectsFromStorage(landData); |
915 | } | 918 | } |
919 | // TODO: REMOVE (TEDD) | ||
916 | MainLog.Instance.Verbose("SCENE", "Done loading land objects from storage"); | 920 | MainLog.Instance.Verbose("SCENE", "Done loading land objects from storage"); |
917 | } | 921 | } |
918 | 922 | ||