diff options
author | Tedd Hansen | 2008-01-19 21:33:39 +0000 |
---|---|---|
committer | Tedd Hansen | 2008-01-19 21:33:39 +0000 |
commit | 4b56e0e3246ed7d1fbc69c7d11137dde5142976a (patch) | |
tree | 789a708e4c9992388fe2f7af86d932562860ae41 /OpenSim/Region/Environment | |
parent | More debugging (diff) | |
download | opensim-SC_OLD-4b56e0e3246ed7d1fbc69c7d11137dde5142976a.zip opensim-SC_OLD-4b56e0e3246ed7d1fbc69c7d11137dde5142976a.tar.gz opensim-SC_OLD-4b56e0e3246ed7d1fbc69c7d11137dde5142976a.tar.bz2 opensim-SC_OLD-4b56e0e3246ed7d1fbc69c7d11137dde5142976a.tar.xz |
removed additional debugging, added temp mega-debugging to StoreLandObject
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/LandManagement/Land.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Environment/LandManagement/LandManager.cs | 16 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 5 |
3 files changed, 0 insertions, 27 deletions
diff --git a/OpenSim/Region/Environment/LandManagement/Land.cs b/OpenSim/Region/Environment/LandManagement/Land.cs index cd56aae..7cc8519 100644 --- a/OpenSim/Region/Environment/LandManagement/Land.cs +++ b/OpenSim/Region/Environment/LandManagement/Land.cs | |||
@@ -447,14 +447,8 @@ namespace OpenSim.Region.Environment.LandManagement | |||
447 | /// </summary> | 447 | /// </summary> |
448 | public void forceUpdateLandInfo() | 448 | public void forceUpdateLandInfo() |
449 | { | 449 | { |
450 | // TODO: REMOVE (TEDD) | ||
451 | MainLog.Instance.Verbose("LandManager", "updateAABBAndAreaValues()"); | ||
452 | updateAABBAndAreaValues(); | 450 | updateAABBAndAreaValues(); |
453 | // TODO: REMOVE (TEDD) | ||
454 | MainLog.Instance.Verbose("LandManager", "updateLandBitmapByteArray()"); | ||
455 | updateLandBitmapByteArray(); | 451 | updateLandBitmapByteArray(); |
456 | // TODO: REMOVE (TEDD) | ||
457 | MainLog.Instance.Verbose("LandManager", "end of forceUpdateLandInfo()"); | ||
458 | } | 452 | } |
459 | 453 | ||
460 | public void setLandBitmapFromByteArray() | 454 | public void setLandBitmapFromByteArray() |
diff --git a/OpenSim/Region/Environment/LandManagement/LandManager.cs b/OpenSim/Region/Environment/LandManagement/LandManager.cs index 155c91f..55a5b5f 100644 --- a/OpenSim/Region/Environment/LandManagement/LandManager.cs +++ b/OpenSim/Region/Environment/LandManagement/LandManager.cs | |||
@@ -138,17 +138,9 @@ namespace OpenSim.Region.Environment.LandManagement | |||
138 | 138 | ||
139 | public void IncomingLandObjectFromStorage(LandData data) | 139 | public void IncomingLandObjectFromStorage(LandData data) |
140 | { | 140 | { |
141 | // TODO: REMOVE (TEDD) | ||
142 | MainLog.Instance.Verbose("LandManager", "IncomingLandObjectFromStorage: " + data.localID); | ||
143 | Land new_land = new Land(data.ownerID, data.isGroupOwned, m_scene); | 141 | Land new_land = new Land(data.ownerID, data.isGroupOwned, m_scene); |
144 | // TODO: REMOVE (TEDD) | ||
145 | MainLog.Instance.Verbose("LandManager", "IncomingLandObjectFromStorage: data.Copy()"); | ||
146 | new_land.landData = data.Copy(); | 142 | new_land.landData = data.Copy(); |
147 | // TODO: REMOVE (TEDD) | ||
148 | MainLog.Instance.Verbose("LandManager", "IncomingLandObjectFromStorage: new_land.setLandBitmapFromByteArray()"); | ||
149 | new_land.setLandBitmapFromByteArray(); | 143 | new_land.setLandBitmapFromByteArray(); |
150 | // TODO: REMOVE (TEDD) | ||
151 | MainLog.Instance.Verbose("LandManager", "IncomingLandObjectFromStorage: addLandObject(new_land)"); | ||
152 | addLandObject(new_land); | 144 | addLandObject(new_land); |
153 | } | 145 | } |
154 | 146 | ||
@@ -177,15 +169,11 @@ namespace OpenSim.Region.Environment.LandManagement | |||
177 | /// <param name="new_land">The land object being added</param> | 169 | /// <param name="new_land">The land object being added</param> |
178 | public Land addLandObject(Land new_land) | 170 | public Land addLandObject(Land new_land) |
179 | { | 171 | { |
180 | // TODO: REMOVE (TEDD) | ||
181 | MainLog.Instance.Verbose("LandManager", "addLandObject()"); | ||
182 | lastLandLocalID++; | 172 | lastLandLocalID++; |
183 | new_land.landData.localID = lastLandLocalID; | 173 | new_land.landData.localID = lastLandLocalID; |
184 | landList.Add(lastLandLocalID, new_land.Copy()); | 174 | landList.Add(lastLandLocalID, new_land.Copy()); |
185 | 175 | ||
186 | 176 | ||
187 | // TODO: REMOVE (TEDD) | ||
188 | MainLog.Instance.Verbose("LandManager", "new_land.getLandBitmap()"); | ||
189 | bool[,] landBitmap = new_land.getLandBitmap(); | 177 | bool[,] landBitmap = new_land.getLandBitmap(); |
190 | int x, y; | 178 | int x, y; |
191 | for (x = 0; x < 64; x++) | 179 | for (x = 0; x < 64; x++) |
@@ -198,12 +186,8 @@ namespace OpenSim.Region.Environment.LandManagement | |||
198 | } | 186 | } |
199 | } | 187 | } |
200 | } | 188 | } |
201 | // TODO: REMOVE (TEDD) | ||
202 | MainLog.Instance.Verbose("LandManager", "forceUpdateLandInfo()"); | ||
203 | landList[lastLandLocalID].forceUpdateLandInfo(); | 189 | landList[lastLandLocalID].forceUpdateLandInfo(); |
204 | MainLog.Instance.Verbose("LandManager", "TriggerLandObjectAdded"); | ||
205 | m_scene.EventManager.TriggerLandObjectAdded(new_land, m_scene.RegionInfo.RegionID); | 190 | m_scene.EventManager.TriggerLandObjectAdded(new_land, m_scene.RegionInfo.RegionID); |
206 | MainLog.Instance.Verbose("LandManager", "end of addLandObject()"); | ||
207 | return new_land; | 191 | return new_land; |
208 | } | 192 | } |
209 | 193 | ||
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 9e13fe7..f327b2b 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1703,15 +1703,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
1703 | /// </summary> | 1703 | /// </summary> |
1704 | public void performParcelPrimCountUpdate() | 1704 | public void performParcelPrimCountUpdate() |
1705 | { | 1705 | { |
1706 | MainLog.Instance.Verbose("SCENE", "Performing parcel prim count update: resetAllLandPrimCounts()"); | ||
1707 | m_LandManager.resetAllLandPrimCounts(); | 1706 | m_LandManager.resetAllLandPrimCounts(); |
1708 | MainLog.Instance.Verbose("SCENE", "Performing parcel prim count update: TriggerParcelPrimCountUpdate()"); | ||
1709 | m_eventManager.TriggerParcelPrimCountUpdate(); | 1707 | m_eventManager.TriggerParcelPrimCountUpdate(); |
1710 | MainLog.Instance.Verbose("SCENE", "Performing parcel prim count update: finalizeLandPrimCountUpdate()"); | ||
1711 | m_LandManager.finalizeLandPrimCountUpdate(); | 1708 | m_LandManager.finalizeLandPrimCountUpdate(); |
1712 | MainLog.Instance.Verbose("SCENE", "Performing parcel prim count update: landPrimCountTainted = false"); | ||
1713 | m_LandManager.landPrimCountTainted = false; | 1709 | m_LandManager.landPrimCountTainted = false; |
1714 | MainLog.Instance.Verbose("SCENE", "Performing parcel prim count update: Done"); | ||
1715 | } | 1710 | } |
1716 | 1711 | ||
1717 | /// <summary> | 1712 | /// <summary> |