aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorMelanie2012-06-29 22:11:49 +0100
committerMelanie2012-06-29 22:11:49 +0100
commit05cf51cbbdb3f33bb4c532eefc24eb0a194ed378 (patch)
tree5514845e589587a84a621bb6e576136d4869ad29 /OpenSim/Data
parentRevert "Mantis 5977 Corrections to llRegionSayTo" (diff)
parentFix llRegionSayTo the right way (diff)
downloadopensim-SC_OLD-05cf51cbbdb3f33bb4c532eefc24eb0a194ed378.zip
opensim-SC_OLD-05cf51cbbdb3f33bb4c532eefc24eb0a194ed378.tar.gz
opensim-SC_OLD-05cf51cbbdb3f33bb4c532eefc24eb0a194ed378.tar.bz2
opensim-SC_OLD-05cf51cbbdb3f33bb4c532eefc24eb0a194ed378.tar.xz
Merge branch 'avination' into careminster
Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs60
1 files changed, 34 insertions, 26 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 4e7c8af..31c80c1 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -1331,32 +1331,40 @@ namespace OpenSim.Data.MySQL
1331 /// <returns></returns> 1331 /// <returns></returns>
1332 private static TaskInventoryItem BuildItem(IDataReader row) 1332 private static TaskInventoryItem BuildItem(IDataReader row)
1333 { 1333 {
1334 TaskInventoryItem taskItem = new TaskInventoryItem(); 1334 try
1335 1335 {
1336 taskItem.ItemID = DBGuid.FromDB(row["itemID"]); 1336 TaskInventoryItem taskItem = new TaskInventoryItem();
1337 taskItem.ParentPartID = DBGuid.FromDB(row["primID"]); 1337
1338 taskItem.AssetID = DBGuid.FromDB(row["assetID"]); 1338 taskItem.ItemID = DBGuid.FromDB(row["itemID"]);
1339 taskItem.ParentID = DBGuid.FromDB(row["parentFolderID"]); 1339 taskItem.ParentPartID = DBGuid.FromDB(row["primID"]);
1340 1340 taskItem.AssetID = DBGuid.FromDB(row["assetID"]);
1341 taskItem.InvType = Convert.ToInt32(row["invType"]); 1341 taskItem.ParentID = DBGuid.FromDB(row["parentFolderID"]);
1342 taskItem.Type = Convert.ToInt32(row["assetType"]); 1342
1343 1343 taskItem.InvType = Convert.ToInt32(row["invType"]);
1344 taskItem.Name = (String)row["name"]; 1344 taskItem.Type = Convert.ToInt32(row["assetType"]);
1345 taskItem.Description = (String)row["description"]; 1345
1346 taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]); 1346 taskItem.Name = (String)row["name"];
1347 taskItem.CreatorIdentification = (String)row["creatorID"]; 1347 taskItem.Description = (String)row["description"];
1348 taskItem.OwnerID = DBGuid.FromDB(row["ownerID"]); 1348 taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]);
1349 taskItem.LastOwnerID = DBGuid.FromDB(row["lastOwnerID"]); 1349 taskItem.CreatorIdentification = (String)row["creatorID"];
1350 taskItem.GroupID = DBGuid.FromDB(row["groupID"]); 1350 taskItem.OwnerID = DBGuid.FromDB(row["ownerID"]);
1351 1351 taskItem.LastOwnerID = DBGuid.FromDB(row["lastOwnerID"]);
1352 taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]); 1352 taskItem.GroupID = DBGuid.FromDB(row["groupID"]);
1353 taskItem.CurrentPermissions = Convert.ToUInt32(row["currentPermissions"]); 1353
1354 taskItem.BasePermissions = Convert.ToUInt32(row["basePermissions"]); 1354 taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]);
1355 taskItem.EveryonePermissions = Convert.ToUInt32(row["everyonePermissions"]); 1355 taskItem.CurrentPermissions = Convert.ToUInt32(row["currentPermissions"]);
1356 taskItem.GroupPermissions = Convert.ToUInt32(row["groupPermissions"]); 1356 taskItem.BasePermissions = Convert.ToUInt32(row["basePermissions"]);
1357 taskItem.Flags = Convert.ToUInt32(row["flags"]); 1357 taskItem.EveryonePermissions = Convert.ToUInt32(row["everyonePermissions"]);
1358 1358 taskItem.GroupPermissions = Convert.ToUInt32(row["groupPermissions"]);
1359 return taskItem; 1359 taskItem.Flags = Convert.ToUInt32(row["flags"]);
1360
1361 return taskItem;
1362 }
1363 catch
1364 {
1365 m_log.ErrorFormat("[MYSQL DB]: Error reading task inventory: itemID was {0}, primID was {1}", row["itemID"].ToString(), row["primID"].ToString());
1366 throw;
1367 }
1360 } 1368 }
1361 1369
1362 private static RegionSettings BuildRegionSettings(IDataReader row) 1370 private static RegionSettings BuildRegionSettings(IDataReader row)