aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLDataStore.cs19
-rw-r--r--OpenSim/Region/Environment/LandManagement/Land.cs6
-rw-r--r--OpenSim/Region/Environment/LandManagement/LandManager.cs16
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs5
4 files changed, 19 insertions, 27 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
index 5a9aba9..7929c0d 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
@@ -418,38 +418,57 @@ namespace OpenSim.Framework.Data.MySQL
418 { 418 {
419 lock (m_dataSet) 419 lock (m_dataSet)
420 { 420 {
421 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 1");
421 DataTable land = m_landTable; 422 DataTable land = m_landTable;
423 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 2");
422 DataTable landaccesslist = m_landAccessListTable; 424 DataTable landaccesslist = m_landAccessListTable;
423 425
426 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 3");
424 DataRow landRow = land.Rows.Find(Util.ToRawUuidString(parcel.landData.globalID)); 427 DataRow landRow = land.Rows.Find(Util.ToRawUuidString(parcel.landData.globalID));
428 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 4");
425 if (landRow == null) 429 if (landRow == null)
426 { 430 {
431 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 5");
427 landRow = land.NewRow(); 432 landRow = land.NewRow();
433 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 6");
428 fillLandRow(landRow, parcel.landData, regionUUID); 434 fillLandRow(landRow, parcel.landData, regionUUID);
435 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 7");
429 land.Rows.Add(landRow); 436 land.Rows.Add(landRow);
430 } 437 }
431 else 438 else
432 { 439 {
440 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 8");
433 fillLandRow(landRow, parcel.landData, regionUUID); 441 fillLandRow(landRow, parcel.landData, regionUUID);
434 } 442 }
435 443
444 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 9");
436 using ( 445 using (
437 MySqlCommand cmd = 446 MySqlCommand cmd =
438 new MySqlCommand("delete from landaccesslist where LandUUID=?LandUUID", m_connection)) 447 new MySqlCommand("delete from landaccesslist where LandUUID=?LandUUID", m_connection))
439 { 448 {
449 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 10");
440 cmd.Parameters.Add(new MySqlParameter("?LandUUID", Util.ToRawUuidString(parcel.landData.globalID))); 450 cmd.Parameters.Add(new MySqlParameter("?LandUUID", Util.ToRawUuidString(parcel.landData.globalID)));
451 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 11");
441 cmd.ExecuteNonQuery(); 452 cmd.ExecuteNonQuery();
442 } 453 }
443 454
455 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 12");
456 int i = 0;
444 foreach (ParcelManager.ParcelAccessEntry entry in parcel.landData.parcelAccessList) 457 foreach (ParcelManager.ParcelAccessEntry entry in parcel.landData.parcelAccessList)
445 { 458 {
459 i++;
460 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 12:1:" + i);
446 DataRow newAccessRow = landaccesslist.NewRow(); 461 DataRow newAccessRow = landaccesslist.NewRow();
462 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 12:2:" + i);
447 fillLandAccessRow(newAccessRow, entry, parcel.landData.globalID); 463 fillLandAccessRow(newAccessRow, entry, parcel.landData.globalID);
464 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 12:3:" + i);
448 landaccesslist.Rows.Add(newAccessRow); 465 landaccesslist.Rows.Add(newAccessRow);
449 } 466 }
450 } 467 }
451 468
469 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 13");
452 Commit(); 470 Commit();
471 MainLog.Instance.Verbose("DATASTORE", "Tedd debug: 14");
453 } 472 }
454 473
455 public List<LandData> LoadLandObjects(LLUUID regionUUID) 474 public List<LandData> LoadLandObjects(LLUUID regionUUID)
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>