aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
authorDiva Canto2010-11-21 13:16:52 -0800
committerDiva Canto2010-11-21 13:16:52 -0800
commit6a9ae9e7cb71d79e9ec06cf25009e8bf45850dd1 (patch)
tree6668ec7fc7816fb0fbe3793ac0967504d2f8c5ce /OpenSim/Data/MySQL
parentFix global region coordinates that are delivered by llRequestSimulatorData. (diff)
downloadopensim-SC_OLD-6a9ae9e7cb71d79e9ec06cf25009e8bf45850dd1.zip
opensim-SC_OLD-6a9ae9e7cb71d79e9ec06cf25009e8bf45850dd1.tar.gz
opensim-SC_OLD-6a9ae9e7cb71d79e9ec06cf25009e8bf45850dd1.tar.bz2
opensim-SC_OLD-6a9ae9e7cb71d79e9ec06cf25009e8bf45850dd1.tar.xz
Global creator information working on MySQL DB and on load/save OARs. Creator name properly shown on the viewer as first.last @authority.
New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars. Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule.
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs4
-rw-r--r--OpenSim/Data/MySQL/Resources/RegionStore.migrations8
2 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index ae78814..f630dc1 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -1090,7 +1090,7 @@ namespace OpenSim.Data.MySQL
1090 1090
1091 // depending on the MySQL connector version, CHAR(36) may be already converted to Guid! 1091 // depending on the MySQL connector version, CHAR(36) may be already converted to Guid!
1092 prim.UUID = DBGuid.FromDB(row["UUID"]); 1092 prim.UUID = DBGuid.FromDB(row["UUID"]);
1093 prim.CreatorID = DBGuid.FromDB(row["CreatorID"]); 1093 prim.CreatorIdentification = (string)row["CreatorID"];
1094 prim.OwnerID = DBGuid.FromDB(row["OwnerID"]); 1094 prim.OwnerID = DBGuid.FromDB(row["OwnerID"]);
1095 prim.GroupID = DBGuid.FromDB(row["GroupID"]); 1095 prim.GroupID = DBGuid.FromDB(row["GroupID"]);
1096 prim.LastOwnerID = DBGuid.FromDB(row["LastOwnerID"]); 1096 prim.LastOwnerID = DBGuid.FromDB(row["LastOwnerID"]);
@@ -1453,7 +1453,7 @@ namespace OpenSim.Data.MySQL
1453 cmd.Parameters.AddWithValue("TouchName", prim.TouchName); 1453 cmd.Parameters.AddWithValue("TouchName", prim.TouchName);
1454 // permissions 1454 // permissions
1455 cmd.Parameters.AddWithValue("ObjectFlags", (uint)prim.Flags); 1455 cmd.Parameters.AddWithValue("ObjectFlags", (uint)prim.Flags);
1456 cmd.Parameters.AddWithValue("CreatorID", prim.CreatorID.ToString()); 1456 cmd.Parameters.AddWithValue("CreatorID", prim.CreatorIdentification.ToString());
1457 cmd.Parameters.AddWithValue("OwnerID", prim.OwnerID.ToString()); 1457 cmd.Parameters.AddWithValue("OwnerID", prim.OwnerID.ToString());
1458 cmd.Parameters.AddWithValue("GroupID", prim.GroupID.ToString()); 1458 cmd.Parameters.AddWithValue("GroupID", prim.GroupID.ToString());
1459 cmd.Parameters.AddWithValue("LastOwnerID", prim.LastOwnerID.ToString()); 1459 cmd.Parameters.AddWithValue("LastOwnerID", prim.LastOwnerID.ToString());
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index 1405207..364c4d3 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -817,3 +817,11 @@ ALTER TABLE `land` ADD COLUMN `MediaLoop` BOOLEAN NOT NULL DEFAULT FALSE;
817ALTER TABLE `land` ADD COLUMN `ObscureMusic` BOOLEAN NOT NULL DEFAULT FALSE; 817ALTER TABLE `land` ADD COLUMN `ObscureMusic` BOOLEAN NOT NULL DEFAULT FALSE;
818ALTER TABLE `land` ADD COLUMN `ObscureMedia` BOOLEAN NOT NULL DEFAULT FALSE; 818ALTER TABLE `land` ADD COLUMN `ObscureMedia` BOOLEAN NOT NULL DEFAULT FALSE;
819COMMIT; 819COMMIT;
820
821:VERSION 37 #---------------------
822
823BEGIN;
824
825ALTER TABLE `prims` MODIFY COLUMN `CreatorID` VARCHAR(255) NOT NULL DEFAULT '';
826
827COMMIT;