diff options
author | Charles Krinke | 2008-02-02 16:43:57 +0000 |
---|---|---|
committer | Charles Krinke | 2008-02-02 16:43:57 +0000 |
commit | 6a1d9e8da13ed09fa8334db8763854c908742587 (patch) | |
tree | 75f0786187bd9def08256caeb465e98aa46e2e9b /OpenSim/Framework | |
parent | * Fixed llSetTextureAnim to respect rate and Length and Start (diff) | |
download | opensim-SC_OLD-6a1d9e8da13ed09fa8334db8763854c908742587.zip opensim-SC_OLD-6a1d9e8da13ed09fa8334db8763854c908742587.tar.gz opensim-SC_OLD-6a1d9e8da13ed09fa8334db8763854c908742587.tar.bz2 opensim-SC_OLD-6a1d9e8da13ed09fa8334db8763854c908742587.tar.xz |
Thank you very much daTwitch for your first contribution to the C# simulator.
This is the beginnings of support for storage of region owner in the MySQLManager
table and the use of "owner_uuid".
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Data.MySQL/MySQLManager.cs | 41 |
1 files changed, 36 insertions, 5 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs index 15ccf5f..eb94cbd 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs | |||
@@ -331,6 +331,20 @@ namespace OpenSim.Framework.Data.MySQL | |||
331 | { | 331 | { |
332 | retval.regionMapTextureID = LLUUID.Zero; | 332 | retval.regionMapTextureID = LLUUID.Zero; |
333 | } | 333 | } |
334 | |||
335 | // Added by daTwitch | ||
336 | // part of an initial brutish effort to provide accurate information (as per the xml region spec) | ||
337 | // wrt the ownership of a given region | ||
338 | // the (very bad) assumption is that this value is being read and handled inconsistently or | ||
339 | // not at all. Current strategy is to put the code in place to support the validity of this information | ||
340 | // and to roll forward debugging any issues from that point | ||
341 | // | ||
342 | // this particular section of the mod attempts to supply a value from the region table to the caller of 'readSimRow()' | ||
343 | // for the UUID of the region's owner (master avatar) | ||
344 | // | ||
345 | retval.owner_uuid = (string) reader["owner_uuid"]; | ||
346 | // | ||
347 | // end of daTwitch's mods to this file | ||
334 | } | 348 | } |
335 | else | 349 | else |
336 | { | 350 | { |
@@ -625,18 +639,32 @@ namespace OpenSim.Framework.Data.MySQL | |||
625 | sql += "regions (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, "; | 639 | sql += "regions (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, "; |
626 | sql += | 640 | sql += |
627 | "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, "; | 641 | "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, "; |
642 | |||
643 | // Added by daTwitch | ||
644 | // part of an initial brutish effort to provide accurate information (as per the xml region spec) | ||
645 | // wrt the ownership of a given region | ||
646 | // the (very bad) assumption is that this value is being read and handled inconsistently or | ||
647 | // not at all. Current strategy is to put the code in place to support the validity of this information | ||
648 | // and to roll forward debugging any issues from that point | ||
649 | // | ||
650 | // this particular section of the mod attempts to implement the commit of a supplied value | ||
651 | // 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, | ||
652 | // as well as the related parameterization | ||
628 | sql += | 653 | sql += |
629 | "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort) VALUES "; | 654 | "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort, owner_uuid) VALUES "; |
655 | // daTwitch | ||
656 | |||
630 | 657 | ||
631 | sql += "(?regionHandle, ?regionName, ?uuid, ?regionRecvKey, ?regionSecret, ?regionSendKey, ?regionDataURI, "; | 658 | sql += "(?regionHandle, ?regionName, ?uuid, ?regionRecvKey, ?regionSecret, ?regionSendKey, ?regionDataURI, "; |
632 | sql += | 659 | sql += |
633 | "?serverIP, ?serverPort, ?serverURI, ?locX, ?locY, ?locZ, ?eastOverrideHandle, ?westOverrideHandle, ?southOverrideHandle, ?northOverrideHandle, ?regionAssetURI, ?regionAssetRecvKey, "; | 660 | "?serverIP, ?serverPort, ?serverURI, ?locX, ?locY, ?locZ, ?eastOverrideHandle, ?westOverrideHandle, ?southOverrideHandle, ?northOverrideHandle, ?regionAssetURI, ?regionAssetRecvKey, "; |
634 | sql += | 661 | sql += |
635 | "?regionAssetSendKey, ?regionUserURI, ?regionUserRecvKey, ?regionUserSendKey, ?regionMapTexture, ?serverHttpPort, ?serverRemotingPort)"; | 662 | "?regionAssetSendKey, ?regionUserURI, ?regionUserRecvKey, ?regionUserSendKey, ?regionMapTexture, ?serverHttpPort, ?serverRemotingPort, ?owner_uuid)"; |
636 | 663 | // daTwitch | |
637 | if (GRID_ONLY_UPDATE_NECESSARY_DATA) | 664 | if (GRID_ONLY_UPDATE_NECESSARY_DATA) |
638 | { | 665 | { |
639 | sql += "ON DUPLICATE KEY UPDATE serverIP = ?serverIP, serverPort = ?serverPort, serverURI = ?serverURI;"; | 666 | sql += "ON DUPLICATE KEY UPDATE serverIP = ?serverIP, serverPort = ?serverPort, serverURI = ?serverURI, owner_uuid - ?owner_uuid;"; |
667 | // daTwitch | ||
640 | } | 668 | } |
641 | else | 669 | else |
642 | { | 670 | { |
@@ -671,6 +699,9 @@ namespace OpenSim.Framework.Data.MySQL | |||
671 | parameters["?regionMapTexture"] = regiondata.regionMapTextureID.ToString(); | 699 | parameters["?regionMapTexture"] = regiondata.regionMapTextureID.ToString(); |
672 | parameters["?serverHttpPort"] = regiondata.httpPort.ToString(); | 700 | parameters["?serverHttpPort"] = regiondata.httpPort.ToString(); |
673 | parameters["?serverRemotingPort"] = regiondata.remotingPort.ToString(); | 701 | parameters["?serverRemotingPort"] = regiondata.remotingPort.ToString(); |
702 | parameters["?owner_uuid"] = regiondata.owner_uuid.ToString(); | ||
703 | // daTwitch | ||
704 | |||
674 | bool returnval = false; | 705 | bool returnval = false; |
675 | 706 | ||
676 | try | 707 | try |
@@ -694,4 +725,4 @@ namespace OpenSim.Framework.Data.MySQL | |||
694 | return returnval; | 725 | return returnval; |
695 | } | 726 | } |
696 | } | 727 | } |
697 | } \ No newline at end of file | 728 | } |