diff options
author | Diva Canto | 2010-11-21 13:16:52 -0800 |
---|---|---|
committer | Diva Canto | 2010-11-21 13:16:52 -0800 |
commit | 6a9ae9e7cb71d79e9ec06cf25009e8bf45850dd1 (patch) | |
tree | 6668ec7fc7816fb0fbe3793ac0967504d2f8c5ce /OpenSim/Data/MySQL/MySQLSimulationData.cs | |
parent | Fix global region coordinates that are delivered by llRequestSimulatorData. (diff) | |
download | opensim-SC-6a9ae9e7cb71d79e9ec06cf25009e8bf45850dd1.zip opensim-SC-6a9ae9e7cb71d79e9ec06cf25009e8bf45850dd1.tar.gz opensim-SC-6a9ae9e7cb71d79e9ec06cf25009e8bf45850dd1.tar.bz2 opensim-SC-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 '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 4 |
1 files changed, 2 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()); |