aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-01-16 08:32:32 -0800
committerDiva Canto2010-01-16 08:32:32 -0800
commit5ce12c92d976fa32c076689bb3f937d8a8d60dc0 (patch)
treea986422d6f338b7797e5848c0012a52afcbb9eda
parentMoved prim crossing to EntityTransferModule. Not complete yet. (diff)
downloadopensim-SC-5ce12c92d976fa32c076689bb3f937d8a8d60dc0.zip
opensim-SC-5ce12c92d976fa32c076689bb3f937d8a8d60dc0.tar.gz
opensim-SC-5ce12c92d976fa32c076689bb3f937d8a8d60dc0.tar.bz2
opensim-SC-5ce12c92d976fa32c076689bb3f937d8a8d60dc0.tar.xz
Fixed a missing field in the last regions table migration.
-rw-r--r--OpenSim/Data/MySQL/Resources/007_GridStore.sql1
-rw-r--r--OpenSim/Services/Interfaces/IGridService.cs6
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/Resources/007_GridStore.sql b/OpenSim/Data/MySQL/Resources/007_GridStore.sql
index 3f88d3d..dbec584 100644
--- a/OpenSim/Data/MySQL/Resources/007_GridStore.sql
+++ b/OpenSim/Data/MySQL/Resources/007_GridStore.sql
@@ -1,6 +1,7 @@
1BEGIN; 1BEGIN;
2 2
3ALTER TABLE `regions` ADD COLUMN `PrincipalID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'; 3ALTER TABLE `regions` ADD COLUMN `PrincipalID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
4ALTER TABLE `regions` ADD COLUMN `Token` varchar(255) NOT NULL;
4 5
5COMMIT; 6COMMIT;
6 7
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 6a83f65..2f5e991 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -307,7 +307,7 @@ namespace OpenSim.Services.Interfaces
307 kvp["access"] = Access.ToString(); 307 kvp["access"] = Access.ToString();
308 kvp["regionSecret"] = RegionSecret; 308 kvp["regionSecret"] = RegionSecret;
309 kvp["owner_uuid"] = EstateOwner.ToString(); 309 kvp["owner_uuid"] = EstateOwner.ToString();
310 kvp["token"] = Token.ToString(); 310 kvp["Token"] = Token.ToString();
311 // Maturity doesn't seem to exist in the DB 311 // Maturity doesn't seem to exist in the DB
312 return kvp; 312 return kvp;
313 } 313 }
@@ -365,8 +365,8 @@ namespace OpenSim.Services.Interfaces
365 if (kvp.ContainsKey("owner_uuid")) 365 if (kvp.ContainsKey("owner_uuid"))
366 EstateOwner = new UUID(kvp["owner_uuid"].ToString()); 366 EstateOwner = new UUID(kvp["owner_uuid"].ToString());
367 367
368 if (kvp.ContainsKey("token")) 368 if (kvp.ContainsKey("Token"))
369 Token = kvp["token"].ToString(); 369 Token = kvp["Token"].ToString();
370 370
371 } 371 }
372 } 372 }