aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Data.MySQL/MySQLManager.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Data.MySQL/MySQLManager.cs')
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLManager.cs48
1 files changed, 19 insertions, 29 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index 0ec976c..e8c42f3 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -344,17 +344,14 @@ namespace OpenSim.Framework.Data.MySQL
344 retval.regionMapTextureID = LLUUID.Zero; 344 retval.regionMapTextureID = LLUUID.Zero;
345 } 345 }
346 346
347 // Added by daTwitch 347 // part of an initial brutish effort to provide accurate information (as per the xml region spec)
348 // part of an initial brutish effort to provide accurate information (as per the xml region spec) 348 // wrt the ownership of a given region
349 // wrt the ownership of a given region 349 // the (very bad) assumption is that this value is being read and handled inconsistently or
350 // the (very bad) assumption is that this value is being read and handled inconsistently or 350 // not at all. Current strategy is to put the code in place to support the validity of this information
351 // not at all. Current strategy is to put the code in place to support the validity of this information 351 // and to roll forward debugging any issues from that point
352 // and to roll forward debugging any issues from that point 352 //
353 // 353 // this particular section of the mod attempts to supply a value from the region table to the caller of 'readSimRow()'
354 // this particular section of the mod attempts to supply a value from the region table to the caller of 'readSimRow()' 354 // for the UUID of the region's owner (master avatar)
355 // for the UUID of the region's owner (master avatar)
356 //
357 //retval.owner_uuid = (string) reader["owner_uuid"];
358 try 355 try
359 { 356 {
360 retval.owner_uuid = new LLUUID((string)reader["owner_uuid"]); 357 retval.owner_uuid = new LLUUID((string)reader["owner_uuid"]);
@@ -363,8 +360,6 @@ namespace OpenSim.Framework.Data.MySQL
363 { 360 {
364 retval.owner_uuid = LLUUID.Zero; 361 retval.owner_uuid = LLUUID.Zero;
365 } 362 }
366 //
367 // end of daTwitch's mods to this file
368 } 363 }
369 else 364 else
370 { 365 {
@@ -660,31 +655,27 @@ namespace OpenSim.Framework.Data.MySQL
660 sql += 655 sql +=
661 "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, "; 656 "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";
662 657
663 // Added by daTwitch 658 // part of an initial brutish effort to provide accurate information (as per the xml region spec)
664 // part of an initial brutish effort to provide accurate information (as per the xml region spec) 659 // wrt the ownership of a given region
665 // wrt the ownership of a given region 660 // the (very bad) assumption is that this value is being read and handled inconsistently or
666 // the (very bad) assumption is that this value is being read and handled inconsistently or 661 // not at all. Current strategy is to put the code in place to support the validity of this information
667 // not at all. Current strategy is to put the code in place to support the validity of this information 662 // and to roll forward debugging any issues from that point
668 // and to roll forward debugging any issues from that point 663 //
669 // 664 // this particular section of the mod attempts to implement the commit of a supplied value
670 // this particular section of the mod attempts to implement the commit of a supplied value 665 // server for the UUID of the region's owner (master avatar). It consists of the addition of the column and value to the relevant sql,
671 // server for the UUID of the region's owner (master avatar). It consists of the addition of the column and value to the relevant sql, 666 // as well as the related parameterization
672 // as well as the related parameterization
673 sql += 667 sql +=
674 "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort, owner_uuid) VALUES "; 668 "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort, owner_uuid) VALUES ";
675 // daTwitch
676
677 669
678 sql += "(?regionHandle, ?regionName, ?uuid, ?regionRecvKey, ?regionSecret, ?regionSendKey, ?regionDataURI, "; 670 sql += "(?regionHandle, ?regionName, ?uuid, ?regionRecvKey, ?regionSecret, ?regionSendKey, ?regionDataURI, ";
679 sql += 671 sql +=
680 "?serverIP, ?serverPort, ?serverURI, ?locX, ?locY, ?locZ, ?eastOverrideHandle, ?westOverrideHandle, ?southOverrideHandle, ?northOverrideHandle, ?regionAssetURI, ?regionAssetRecvKey, "; 672 "?serverIP, ?serverPort, ?serverURI, ?locX, ?locY, ?locZ, ?eastOverrideHandle, ?westOverrideHandle, ?southOverrideHandle, ?northOverrideHandle, ?regionAssetURI, ?regionAssetRecvKey, ";
681 sql += 673 sql +=
682 "?regionAssetSendKey, ?regionUserURI, ?regionUserRecvKey, ?regionUserSendKey, ?regionMapTexture, ?serverHttpPort, ?serverRemotingPort, ?owner_uuid)"; 674 "?regionAssetSendKey, ?regionUserURI, ?regionUserRecvKey, ?regionUserSendKey, ?regionMapTexture, ?serverHttpPort, ?serverRemotingPort, ?owner_uuid)";
683 // daTwitch 675
684 if (GRID_ONLY_UPDATE_NECESSARY_DATA) 676 if (GRID_ONLY_UPDATE_NECESSARY_DATA)
685 { 677 {
686 sql += "ON DUPLICATE KEY UPDATE serverIP = ?serverIP, serverPort = ?serverPort, serverURI = ?serverURI, owner_uuid - ?owner_uuid;"; 678 sql += "ON DUPLICATE KEY UPDATE serverIP = ?serverIP, serverPort = ?serverPort, serverURI = ?serverURI, owner_uuid - ?owner_uuid;";
687 // daTwitch
688 } 679 }
689 else 680 else
690 { 681 {
@@ -719,8 +710,7 @@ namespace OpenSim.Framework.Data.MySQL
719 parameters["?regionMapTexture"] = regiondata.regionMapTextureID.ToString(); 710 parameters["?regionMapTexture"] = regiondata.regionMapTextureID.ToString();
720 parameters["?serverHttpPort"] = regiondata.httpPort.ToString(); 711 parameters["?serverHttpPort"] = regiondata.httpPort.ToString();
721 parameters["?serverRemotingPort"] = regiondata.remotingPort.ToString(); 712 parameters["?serverRemotingPort"] = regiondata.remotingPort.ToString();
722 parameters["?owner_uuid"] = regiondata.owner_uuid.ToString(); 713 parameters["?owner_uuid"] = regiondata.owner_uuid.ToString();
723 // daTwitch
724 714
725 bool returnval = false; 715 bool returnval = false;
726 716