OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Thank you kindly, Ahzzmandius for adding 

owner_uuid support to the MSSQL data driver.
0.6.0-stable
Charles Krinke 2008-03-02 20:33:46 +00:00
parent 30ebd15926
commit dd8e728abd
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
View File

@ -224,13 +224,13 @@ namespace OpenSim.Framework.Data.MSSQL
sql += sql +=
"[serverIP], [serverPort], [serverURI], [locX], [locY], [locZ], [eastOverrideHandle], [westOverrideHandle], [southOverrideHandle], [northOverrideHandle], [regionAssetURI], [regionAssetRecvKey], "; "[serverIP], [serverPort], [serverURI], [locX], [locY], [locZ], [eastOverrideHandle], [westOverrideHandle], [southOverrideHandle], [northOverrideHandle], [regionAssetURI], [regionAssetRecvKey], ";
sql += sql +=
"[regionAssetSendKey], [regionUserURI], [regionUserRecvKey], [regionUserSendKey], [regionMapTexture], [serverHttpPort], [serverRemotingPort]) VALUES "; "[regionAssetSendKey], [regionUserURI], [regionUserRecvKey], [regionUserSendKey], [regionMapTexture], [serverHttpPort], [serverRemotingPort], [owner_uuid]) VALUES ";
sql += "(@regionHandle, @regionName, @uuid, @regionRecvKey, @regionSecret, @regionSendKey, @regionDataURI, "; sql += "(@regionHandle, @regionName, @uuid, @regionRecvKey, @regionSecret, @regionSendKey, @regionDataURI, ";
sql += sql +=
"@serverIP, @serverPort, @serverURI, @locX, @locY, @locZ, @eastOverrideHandle, @westOverrideHandle, @southOverrideHandle, @northOverrideHandle, @regionAssetURI, @regionAssetRecvKey, "; "@serverIP, @serverPort, @serverURI, @locX, @locY, @locZ, @eastOverrideHandle, @westOverrideHandle, @southOverrideHandle, @northOverrideHandle, @regionAssetURI, @regionAssetRecvKey, ";
sql += sql +=
"@regionAssetSendKey, @regionUserURI, @regionUserRecvKey, @regionUserSendKey, @regionMapTexture, @serverHttpPort, @serverRemotingPort);"; "@regionAssetSendKey, @regionUserURI, @regionUserRecvKey, @regionUserSendKey, @regionMapTexture, @serverHttpPort, @serverRemotingPort, @owner_uuid);";
Dictionary<string, string> parameters = new Dictionary<string, string>(); Dictionary<string, string> parameters = new Dictionary<string, string>();
@ -260,7 +260,7 @@ namespace OpenSim.Framework.Data.MSSQL
parameters["regionMapTexture"] = profile.regionMapTextureID.ToString(); parameters["regionMapTexture"] = profile.regionMapTextureID.ToString();
parameters["serverHttpPort"] = profile.httpPort.ToString(); parameters["serverHttpPort"] = profile.httpPort.ToString();
parameters["serverRemotingPort"] = profile.remotingPort.ToString(); parameters["serverRemotingPort"] = profile.remotingPort.ToString();
parameters["owner_uuid"] = profile.owner_uuid.ToString();
bool returnval = false; bool returnval = false;
@ -324,4 +324,4 @@ namespace OpenSim.Framework.Data.MSSQL
return null; return null;
} }
} }
} }

9
OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
View File

@ -264,7 +264,12 @@ namespace OpenSim.Framework.Data.MSSQL
regionprofile.regionUserURI = (string)reader["regionUserURI"]; regionprofile.regionUserURI = (string)reader["regionUserURI"];
regionprofile.regionUserRecvKey = (string)reader["regionUserRecvKey"]; regionprofile.regionUserRecvKey = (string)reader["regionUserRecvKey"];
regionprofile.regionUserSendKey = (string)reader["regionUserSendKey"]; regionprofile.regionUserSendKey = (string)reader["regionUserSendKey"];
try
{
regionprofile.owner_uuid = new LLUUID((string)reader["owner_uuid"]);
}
catch(Exception ex)
{}
// World Map Addition // World Map Addition
string tempRegionMap = reader["regionMapTexture"].ToString(); string tempRegionMap = reader["regionMapTexture"].ToString();
if (tempRegionMap != String.Empty) if (tempRegionMap != String.Empty)
@ -522,4 +527,4 @@ namespace OpenSim.Framework.Data.MSSQL
dllVersion.Revision); dllVersion.Revision);
} }
} }
} }

1
OpenSim/Framework/Data.MSSQL/Resources/Mssql-regions.sql
View File

@ -31,6 +31,7 @@ CREATE TABLE [dbo].[regions](
[regionMapTexture] [varchar](255) COLLATE Latin1_General_CI_AS NULL, [regionMapTexture] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
[serverHttpPort] [varchar](255) COLLATE Latin1_General_CI_AS NULL, [serverHttpPort] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
[serverRemotingPort] [varchar](255) COLLATE Latin1_General_CI_AS NULL, [serverRemotingPort] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
[owner_uuid] [varchar](36) COLLATE Latin1_General_CI_AS NULL,
PRIMARY KEY CLUSTERED PRIMARY KEY CLUSTERED
( (
[uuid] ASC [uuid] ASC