aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorCharles Krinke2008-03-02 20:33:46 +0000
committerCharles Krinke2008-03-02 20:33:46 +0000
commitdd8e728abdeb507fc1bd628cbb9fb0f6a1159a50 (patch)
tree42c813aebfa870c3686fdeb74c325056a4119a24 /OpenSim/Framework
parentUpdate names of handler010 through handler019 (diff)
downloadopensim-SC-dd8e728abdeb507fc1bd628cbb9fb0f6a1159a50.zip
opensim-SC-dd8e728abdeb507fc1bd628cbb9fb0f6a1159a50.tar.gz
opensim-SC-dd8e728abdeb507fc1bd628cbb9fb0f6a1159a50.tar.bz2
opensim-SC-dd8e728abdeb507fc1bd628cbb9fb0f6a1159a50.tar.xz
Thank you kindly, Ahzzmandius for adding
owner_uuid support to the MSSQL data driver.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs8
-rw-r--r--OpenSim/Framework/Data.MSSQL/MSSQLManager.cs9
-rw-r--r--OpenSim/Framework/Data.MSSQL/Resources/Mssql-regions.sql1
3 files changed, 12 insertions, 6 deletions
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs b/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
index 3648437..1ea45bf 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
@@ -224,13 +224,13 @@ namespace OpenSim.Framework.Data.MSSQL
224 sql += 224 sql +=
225 "[serverIP], [serverPort], [serverURI], [locX], [locY], [locZ], [eastOverrideHandle], [westOverrideHandle], [southOverrideHandle], [northOverrideHandle], [regionAssetURI], [regionAssetRecvKey], "; 225 "[serverIP], [serverPort], [serverURI], [locX], [locY], [locZ], [eastOverrideHandle], [westOverrideHandle], [southOverrideHandle], [northOverrideHandle], [regionAssetURI], [regionAssetRecvKey], ";
226 sql += 226 sql +=
227 "[regionAssetSendKey], [regionUserURI], [regionUserRecvKey], [regionUserSendKey], [regionMapTexture], [serverHttpPort], [serverRemotingPort]) VALUES "; 227 "[regionAssetSendKey], [regionUserURI], [regionUserRecvKey], [regionUserSendKey], [regionMapTexture], [serverHttpPort], [serverRemotingPort], [owner_uuid]) VALUES ";
228 228
229 sql += "(@regionHandle, @regionName, @uuid, @regionRecvKey, @regionSecret, @regionSendKey, @regionDataURI, "; 229 sql += "(@regionHandle, @regionName, @uuid, @regionRecvKey, @regionSecret, @regionSendKey, @regionDataURI, ";
230 sql += 230 sql +=
231 "@serverIP, @serverPort, @serverURI, @locX, @locY, @locZ, @eastOverrideHandle, @westOverrideHandle, @southOverrideHandle, @northOverrideHandle, @regionAssetURI, @regionAssetRecvKey, "; 231 "@serverIP, @serverPort, @serverURI, @locX, @locY, @locZ, @eastOverrideHandle, @westOverrideHandle, @southOverrideHandle, @northOverrideHandle, @regionAssetURI, @regionAssetRecvKey, ";
232 sql += 232 sql +=
233 "@regionAssetSendKey, @regionUserURI, @regionUserRecvKey, @regionUserSendKey, @regionMapTexture, @serverHttpPort, @serverRemotingPort);"; 233 "@regionAssetSendKey, @regionUserURI, @regionUserRecvKey, @regionUserSendKey, @regionMapTexture, @serverHttpPort, @serverRemotingPort, @owner_uuid);";
234 234
235 Dictionary<string, string> parameters = new Dictionary<string, string>(); 235 Dictionary<string, string> parameters = new Dictionary<string, string>();
236 236
@@ -260,7 +260,7 @@ namespace OpenSim.Framework.Data.MSSQL
260 parameters["regionMapTexture"] = profile.regionMapTextureID.ToString(); 260 parameters["regionMapTexture"] = profile.regionMapTextureID.ToString();
261 parameters["serverHttpPort"] = profile.httpPort.ToString(); 261 parameters["serverHttpPort"] = profile.httpPort.ToString();
262 parameters["serverRemotingPort"] = profile.remotingPort.ToString(); 262 parameters["serverRemotingPort"] = profile.remotingPort.ToString();
263 263 parameters["owner_uuid"] = profile.owner_uuid.ToString();
264 264
265 bool returnval = false; 265 bool returnval = false;
266 266
@@ -324,4 +324,4 @@ namespace OpenSim.Framework.Data.MSSQL
324 return null; 324 return null;
325 } 325 }
326 } 326 }
327} \ No newline at end of file 327}
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
index 085cf57..0433d1e 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
@@ -264,7 +264,12 @@ namespace OpenSim.Framework.Data.MSSQL
264 regionprofile.regionUserURI = (string)reader["regionUserURI"]; 264 regionprofile.regionUserURI = (string)reader["regionUserURI"];
265 regionprofile.regionUserRecvKey = (string)reader["regionUserRecvKey"]; 265 regionprofile.regionUserRecvKey = (string)reader["regionUserRecvKey"];
266 regionprofile.regionUserSendKey = (string)reader["regionUserSendKey"]; 266 regionprofile.regionUserSendKey = (string)reader["regionUserSendKey"];
267 267 try
268 {
269 regionprofile.owner_uuid = new LLUUID((string)reader["owner_uuid"]);
270 }
271 catch(Exception ex)
272 {}
268 // World Map Addition 273 // World Map Addition
269 string tempRegionMap = reader["regionMapTexture"].ToString(); 274 string tempRegionMap = reader["regionMapTexture"].ToString();
270 if (tempRegionMap != String.Empty) 275 if (tempRegionMap != String.Empty)
@@ -522,4 +527,4 @@ namespace OpenSim.Framework.Data.MSSQL
522 dllVersion.Revision); 527 dllVersion.Revision);
523 } 528 }
524 } 529 }
525} \ No newline at end of file 530}
diff --git a/OpenSim/Framework/Data.MSSQL/Resources/Mssql-regions.sql b/OpenSim/Framework/Data.MSSQL/Resources/Mssql-regions.sql
index c5d8329..b29a2ab 100644
--- a/OpenSim/Framework/Data.MSSQL/Resources/Mssql-regions.sql
+++ b/OpenSim/Framework/Data.MSSQL/Resources/Mssql-regions.sql
@@ -31,6 +31,7 @@ CREATE TABLE [dbo].[regions](
31 [regionMapTexture] [varchar](255) COLLATE Latin1_General_CI_AS NULL, 31 [regionMapTexture] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
32 [serverHttpPort] [varchar](255) COLLATE Latin1_General_CI_AS NULL, 32 [serverHttpPort] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
33 [serverRemotingPort] [varchar](255) COLLATE Latin1_General_CI_AS NULL, 33 [serverRemotingPort] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
34 [owner_uuid] [varchar](36) COLLATE Latin1_General_CI_AS NULL,
34PRIMARY KEY CLUSTERED 35PRIMARY KEY CLUSTERED
35( 36(
36 [uuid] ASC 37 [uuid] ASC