Public feed
#888065
Index: OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
===================================================================
--- OpenSim/Region/Communications/OGS1/OGS1GridServices.cs (revision 3219)
+++ OpenSim/Region/Communications/OGS1/OGS1GridServices.cs (working copy)
@@ -110,6 +110,21 @@
GridParams["remoting_port"] = NetworkServersInfo.RemotingListenerPort.ToString();
GridParams["map-image-id"] = regionInfo.EstateSettings.terrainImageID.ToString();
+
+ // Added by daTwitch
+ // part of an initial brutish effort to provide accurate information (as per the xml region spec)
+ // wrt the ownership of a given region
+ // the (very bad) assumption is that this value is being read and handled inconsistently or
+ // not at all. Current strategy is to put the code in place to support the validity of this information
+ // and to roll forward debugging any issues from that point
+ //
+ // this particular section of the mod attempts to supply a value from the region's xml file to the grid
+ // server for the UUID of the region's owner (master avatar)
+ //
+ GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString();
+ // end of daTwitch's addition to this file
+
+
// Package into an XMLRPC Request
ArrayList SendParams = new ArrayList();
SendParams.Add(GridParams);
@@ -1297,4 +1312,4 @@
}
}
-}
\ No newline at end of file
+}
Index: OpenSim/Grid/GridServer/GridManager.cs
===================================================================
--- OpenSim/Grid/GridServer/GridManager.cs (revision 3219)
+++ OpenSim/Grid/GridServer/GridManager.cs (working copy)
@@ -282,6 +282,19 @@
TheSim.regionLocZ = 0;
TheSim.regionMapTextureID = new LLUUID((string)requestData["map-image-id"]);
+ // Added by daTwitch
+ // part of an initial brutish effort to provide accurate information (as per the xml region spec)
+ // wrt the ownership of a given region
+ // the (very bad) assumption is that this value is being read and handled inconsistently or
+ // not at all. Current strategy is to put the code in place to support the validity of this information
+ // and to roll forward debugging any issues from that point
+ //
+ // this particular section of the mod attempts to receive a value from the region's xml file by way of
+ // OSG1GridServices for the region's owner
+ //
+ TheSim.owner_uuid = (string)requestData["master_avatar_uuid"];
+ // end of daTwitch's mods to this file
+
try
{
TheSim.regionRecvKey = (string)requestData["recvkey"];
Index: OpenSim/Framework/Data.MySQL/MySQLManager.cs
===================================================================
--- OpenSim/Framework/Data.MySQL/MySQLManager.cs (revision 3219)
+++ OpenSim/Framework/Data.MySQL/MySQLManager.cs (working copy)
@@ -331,6 +331,20 @@
{
retval.regionMapTextureID = LLUUID.Zero;
}
+
+ // Added by daTwitch
+ // part of an initial brutish effort to provide accurate information (as per the xml region spec)
+ // wrt the ownership of a given region
+ // the (very bad) assumption is that this value is being read and handled inconsistently or
+ // not at all. Current strategy is to put the code in place to support the validity of this information
+ // and to roll forward debugging any issues from that point
+ //
+ // this particular section of the mod attempts to supply a value from the region table to the caller of 'readSimRow()'
+ // for the UUID of the region's owner (master avatar)
+ //
+ retval.owner_uuid = (string) reader["owner_uuid"];
+ //
+ // end of daTwitch's mods to this file
}
else
{
@@ -625,18 +639,32 @@
sql += "regions (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, ";
sql +=
"serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";
+
+ // Added by daTwitch
+ // part of an initial brutish effort to provide accurate information (as per the xml region spec)
+ // wrt the ownership of a given region
+ // the (very bad) assumption is that this value is being read and handled inconsistently or
+ // not at all. Current strategy is to put the code in place to support the validity of this information
+ // and to roll forward debugging any issues from that point
+ //
+ // this particular section of the mod attempts to implement the commit of a supplied value
+ // 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,
+ // as well as the related parameterization
sql +=
- "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort) VALUES ";
+ "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort, owner_uuid) VALUES ";
+ // daTwitch
+
sql += "(?regionHandle, ?regionName, ?uuid, ?regionRecvKey, ?regionSecret, ?regionSendKey, ?regionDataURI, ";
sql +=
"?serverIP, ?serverPort, ?serverURI, ?locX, ?locY, ?locZ, ?eastOverrideHandle, ?westOverrideHandle, ?southOverrideHandle, ?northOverrideHandle, ?regionAssetURI, ?regionAssetRecvKey, ";
sql +=
- "?regionAssetSendKey, ?regionUserURI, ?regionUserRecvKey, ?regionUserSendKey, ?regionMapTexture, ?serverHttpPort, ?serverRemotingPort)";
-
+ "?regionAssetSendKey, ?regionUserURI, ?regionUserRecvKey, ?regionUserSendKey, ?regionMapTexture, ?serverHttpPort, ?serverRemotingPort, ?owner_uuid)";
+ // daTwitch
if (GRID_ONLY_UPDATE_NECESSARY_DATA)
{
- sql += "ON DUPLICATE KEY UPDATE serverIP = ?serverIP, serverPort = ?serverPort, serverURI = ?serverURI;";
+ sql += "ON DUPLICATE KEY UPDATE serverIP = ?serverIP, serverPort = ?serverPort, serverURI = ?serverURI, owner_uuid - ?owner_uuid;";
+ // daTwitch
}
else
{
@@ -671,6 +699,9 @@
parameters["?regionMapTexture"] = regiondata.regionMapTextureID.ToString();
parameters["?serverHttpPort"] = regiondata.httpPort.ToString();
parameters["?serverRemotingPort"] = regiondata.remotingPort.ToString();
+ parameters["?owner_uuid"] = regiondata.owner_uuid.ToString();
+ // daTwitch
+
bool returnval = false;
try
Index: OpenSim/Framework/Data/RegionProfileData.cs
===================================================================
--- OpenSim/Framework/Data/RegionProfileData.cs (revision 3219)
+++ OpenSim/Framework/Data/RegionProfileData.cs (working copy)
@@ -123,6 +123,24 @@
/// </summary>
public LLUUID regionMapTextureID = new LLUUID("00000000-0000-0000-9999-000000000006");
+ // added by daTwitch
+ // part of an initial brutish effort to provide accurate information (as per the xml region spec)
+ // wrt the ownership of a given region
+ // the (very bad) assumption is that this value is being read and handled inconsistently or
+ // not at all. Current strategy is to put the code in place to support the validity of this information
+ // and to roll forward debugging any issues from that point
+ //
+ // this particular mod to the file provides support within the spec for RegionProfileData for the
+ // owner_uuid for the region
+ //
+ /// <summary>
+ /// this particular mod to the file provides support within the spec for RegionProfileData for the
+ /// owner_uuid for the region
+ /// </summary>
+ public LLUUID owner_uuid;
+ //
+ // end of daTwitch mod to this file
+
/// <summary>
/// Get Sim profile data from grid server when in grid mode
/// </summary>