diff options
author | Sean Dague | 2008-04-07 23:15:35 +0000 |
---|---|---|
committer | Sean Dague | 2008-04-07 23:15:35 +0000 |
commit | f43681510725f5b95fcb864a1f3e4b744fcaf992 (patch) | |
tree | 2d34caa75488d1c608d1a21b4888cb0f264a6cba /OpenSim/Region/ClientStack | |
parent | needed to add 4 characters to support the dashes (diff) | |
download | opensim-SC-f43681510725f5b95fcb864a1f3e4b744fcaf992.zip opensim-SC-f43681510725f5b95fcb864a1f3e4b744fcaf992.tar.gz opensim-SC-f43681510725f5b95fcb864a1f3e4b744fcaf992.tar.bz2 opensim-SC-f43681510725f5b95fcb864a1f3e4b744fcaf992.tar.xz |
Refactor InventoryItemBase to do the following:
* wrap fields as Properties
* rename some fields/properties to more sensible names
* set style to PropName to match more standard C# approach
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 106 |
1 files changed, 53 insertions, 53 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 6af32a9..4325b93 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs | |||
@@ -1219,25 +1219,25 @@ namespace OpenSim.Region.ClientStack | |||
1219 | foreach (InventoryItemBase item in items) | 1219 | foreach (InventoryItemBase item in items) |
1220 | { | 1220 | { |
1221 | descend.ItemData[i] = new InventoryDescendentsPacket.ItemDataBlock(); | 1221 | descend.ItemData[i] = new InventoryDescendentsPacket.ItemDataBlock(); |
1222 | descend.ItemData[i].ItemID = item.inventoryID; | 1222 | descend.ItemData[i].ItemID = item.ID; |
1223 | descend.ItemData[i].AssetID = item.assetID; | 1223 | descend.ItemData[i].AssetID = item.AssetID; |
1224 | descend.ItemData[i].CreatorID = item.creatorsID; | 1224 | descend.ItemData[i].CreatorID = item.Creator; |
1225 | descend.ItemData[i].BaseMask = item.inventoryBasePermissions; | 1225 | descend.ItemData[i].BaseMask = item.BasePermissions; |
1226 | descend.ItemData[i].CreationDate = 1000; | 1226 | descend.ItemData[i].CreationDate = 1000; |
1227 | descend.ItemData[i].Description = Helpers.StringToField(item.inventoryDescription); | 1227 | descend.ItemData[i].Description = Helpers.StringToField(item.Description); |
1228 | descend.ItemData[i].EveryoneMask = item.inventoryEveryOnePermissions; | 1228 | descend.ItemData[i].EveryoneMask = item.EveryOnePermissions; |
1229 | descend.ItemData[i].Flags = 1; | 1229 | descend.ItemData[i].Flags = 1; |
1230 | descend.ItemData[i].FolderID = item.parentFolderID; | 1230 | descend.ItemData[i].FolderID = item.Folder; |
1231 | descend.ItemData[i].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000"); | 1231 | descend.ItemData[i].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000"); |
1232 | descend.ItemData[i].GroupMask = 0; | 1232 | descend.ItemData[i].GroupMask = 0; |
1233 | descend.ItemData[i].InvType = (sbyte) item.invType; | 1233 | descend.ItemData[i].InvType = (sbyte) item.InvType; |
1234 | descend.ItemData[i].Name = Helpers.StringToField(item.inventoryName); | 1234 | descend.ItemData[i].Name = Helpers.StringToField(item.Name); |
1235 | descend.ItemData[i].NextOwnerMask = item.inventoryNextPermissions; | 1235 | descend.ItemData[i].NextOwnerMask = item.NextPermissions; |
1236 | descend.ItemData[i].OwnerID = item.avatarID; | 1236 | descend.ItemData[i].OwnerID = item.Owner; |
1237 | descend.ItemData[i].OwnerMask = item.inventoryCurrentPermissions; | 1237 | descend.ItemData[i].OwnerMask = item.CurrentPermissions; |
1238 | descend.ItemData[i].SalePrice = 0; | 1238 | descend.ItemData[i].SalePrice = 0; |
1239 | descend.ItemData[i].SaleType = 0; | 1239 | descend.ItemData[i].SaleType = 0; |
1240 | descend.ItemData[i].Type = (sbyte) item.assetType; | 1240 | descend.ItemData[i].Type = (sbyte) item.AssetType; |
1241 | descend.ItemData[i].CRC = | 1241 | descend.ItemData[i].CRC = |
1242 | Helpers.InventoryCRC(descend.ItemData[i].CreationDate, descend.ItemData[i].SaleType, | 1242 | Helpers.InventoryCRC(descend.ItemData[i].CreationDate, descend.ItemData[i].SaleType, |
1243 | descend.ItemData[i].InvType, descend.ItemData[i].Type, | 1243 | descend.ItemData[i].InvType, descend.ItemData[i].Type, |
@@ -1247,7 +1247,7 @@ namespace OpenSim.Region.ClientStack | |||
1247 | descend.ItemData[i].ItemID, descend.ItemData[i].FolderID, | 1247 | descend.ItemData[i].ItemID, descend.ItemData[i].FolderID, |
1248 | descend.ItemData[i].EveryoneMask, | 1248 | descend.ItemData[i].EveryoneMask, |
1249 | descend.ItemData[i].Flags, descend.ItemData[i].OwnerMask, | 1249 | descend.ItemData[i].Flags, descend.ItemData[i].OwnerMask, |
1250 | descend.ItemData[i].GroupMask, item.inventoryCurrentPermissions); | 1250 | descend.ItemData[i].GroupMask, item.CurrentPermissions); |
1251 | 1251 | ||
1252 | i++; | 1252 | i++; |
1253 | count++; | 1253 | count++; |
@@ -1364,26 +1364,26 @@ namespace OpenSim.Region.ClientStack | |||
1364 | inventoryReply.AgentData.AgentID = AgentId; | 1364 | inventoryReply.AgentData.AgentID = AgentId; |
1365 | inventoryReply.InventoryData = new FetchInventoryReplyPacket.InventoryDataBlock[1]; | 1365 | inventoryReply.InventoryData = new FetchInventoryReplyPacket.InventoryDataBlock[1]; |
1366 | inventoryReply.InventoryData[0] = new FetchInventoryReplyPacket.InventoryDataBlock(); | 1366 | inventoryReply.InventoryData[0] = new FetchInventoryReplyPacket.InventoryDataBlock(); |
1367 | inventoryReply.InventoryData[0].ItemID = item.inventoryID; | 1367 | inventoryReply.InventoryData[0].ItemID = item.ID; |
1368 | inventoryReply.InventoryData[0].AssetID = item.assetID; | 1368 | inventoryReply.InventoryData[0].AssetID = item.AssetID; |
1369 | inventoryReply.InventoryData[0].CreatorID = item.creatorsID; | 1369 | inventoryReply.InventoryData[0].CreatorID = item.Creator; |
1370 | inventoryReply.InventoryData[0].BaseMask = item.inventoryBasePermissions; | 1370 | inventoryReply.InventoryData[0].BaseMask = item.BasePermissions; |
1371 | inventoryReply.InventoryData[0].CreationDate = | 1371 | inventoryReply.InventoryData[0].CreationDate = |
1372 | (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; | 1372 | (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; |
1373 | inventoryReply.InventoryData[0].Description = Helpers.StringToField(item.inventoryDescription); | 1373 | inventoryReply.InventoryData[0].Description = Helpers.StringToField(item.Description); |
1374 | inventoryReply.InventoryData[0].EveryoneMask = item.inventoryEveryOnePermissions; | 1374 | inventoryReply.InventoryData[0].EveryoneMask = item.EveryOnePermissions; |
1375 | inventoryReply.InventoryData[0].Flags = 0; | 1375 | inventoryReply.InventoryData[0].Flags = 0; |
1376 | inventoryReply.InventoryData[0].FolderID = item.parentFolderID; | 1376 | inventoryReply.InventoryData[0].FolderID = item.Folder; |
1377 | inventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000"); | 1377 | inventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000"); |
1378 | inventoryReply.InventoryData[0].GroupMask = 0; | 1378 | inventoryReply.InventoryData[0].GroupMask = 0; |
1379 | inventoryReply.InventoryData[0].InvType = (sbyte)item.invType; | 1379 | inventoryReply.InventoryData[0].InvType = (sbyte)item.InvType; |
1380 | inventoryReply.InventoryData[0].Name = Helpers.StringToField(item.inventoryName); | 1380 | inventoryReply.InventoryData[0].Name = Helpers.StringToField(item.Name); |
1381 | inventoryReply.InventoryData[0].NextOwnerMask = item.inventoryNextPermissions; | 1381 | inventoryReply.InventoryData[0].NextOwnerMask = item.NextPermissions; |
1382 | inventoryReply.InventoryData[0].OwnerID = item.avatarID; | 1382 | inventoryReply.InventoryData[0].OwnerID = item.Owner; |
1383 | inventoryReply.InventoryData[0].OwnerMask = item.inventoryCurrentPermissions; | 1383 | inventoryReply.InventoryData[0].OwnerMask = item.CurrentPermissions; |
1384 | inventoryReply.InventoryData[0].SalePrice = 0; | 1384 | inventoryReply.InventoryData[0].SalePrice = 0; |
1385 | inventoryReply.InventoryData[0].SaleType = 0; | 1385 | inventoryReply.InventoryData[0].SaleType = 0; |
1386 | inventoryReply.InventoryData[0].Type = (sbyte)item.assetType; | 1386 | inventoryReply.InventoryData[0].Type = (sbyte)item.AssetType; |
1387 | inventoryReply.InventoryData[0].CRC = | 1387 | inventoryReply.InventoryData[0].CRC = |
1388 | Helpers.InventoryCRC(1000, 0, inventoryReply.InventoryData[0].InvType, | 1388 | Helpers.InventoryCRC(1000, 0, inventoryReply.InventoryData[0].InvType, |
1389 | inventoryReply.InventoryData[0].Type, inventoryReply.InventoryData[0].AssetID, | 1389 | inventoryReply.InventoryData[0].Type, inventoryReply.InventoryData[0].AssetID, |
@@ -1416,25 +1416,25 @@ namespace OpenSim.Region.ClientStack | |||
1416 | 1416 | ||
1417 | bulkUpdate.ItemData = new BulkUpdateInventoryPacket.ItemDataBlock[1]; | 1417 | bulkUpdate.ItemData = new BulkUpdateInventoryPacket.ItemDataBlock[1]; |
1418 | bulkUpdate.ItemData[0] = new BulkUpdateInventoryPacket.ItemDataBlock(); | 1418 | bulkUpdate.ItemData[0] = new BulkUpdateInventoryPacket.ItemDataBlock(); |
1419 | bulkUpdate.ItemData[0].ItemID = item.inventoryID; | 1419 | bulkUpdate.ItemData[0].ItemID = item.ID; |
1420 | bulkUpdate.ItemData[0].AssetID = item.assetID; | 1420 | bulkUpdate.ItemData[0].AssetID = item.AssetID; |
1421 | bulkUpdate.ItemData[0].CreatorID = item.creatorsID; | 1421 | bulkUpdate.ItemData[0].CreatorID = item.Creator; |
1422 | bulkUpdate.ItemData[0].BaseMask = item.inventoryBasePermissions; | 1422 | bulkUpdate.ItemData[0].BaseMask = item.BasePermissions; |
1423 | bulkUpdate.ItemData[0].CreationDate = 1000; | 1423 | bulkUpdate.ItemData[0].CreationDate = 1000; |
1424 | bulkUpdate.ItemData[0].Description = Helpers.StringToField(item.inventoryDescription); | 1424 | bulkUpdate.ItemData[0].Description = Helpers.StringToField(item.Description); |
1425 | bulkUpdate.ItemData[0].EveryoneMask = item.inventoryEveryOnePermissions; | 1425 | bulkUpdate.ItemData[0].EveryoneMask = item.EveryOnePermissions; |
1426 | bulkUpdate.ItemData[0].Flags = 0; | 1426 | bulkUpdate.ItemData[0].Flags = 0; |
1427 | bulkUpdate.ItemData[0].FolderID = item.parentFolderID; | 1427 | bulkUpdate.ItemData[0].FolderID = item.Folder; |
1428 | bulkUpdate.ItemData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000"); | 1428 | bulkUpdate.ItemData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000"); |
1429 | bulkUpdate.ItemData[0].GroupMask = 0; | 1429 | bulkUpdate.ItemData[0].GroupMask = 0; |
1430 | bulkUpdate.ItemData[0].InvType = (sbyte)item.invType; | 1430 | bulkUpdate.ItemData[0].InvType = (sbyte)item.InvType; |
1431 | bulkUpdate.ItemData[0].Name = Helpers.StringToField(item.inventoryName); | 1431 | bulkUpdate.ItemData[0].Name = Helpers.StringToField(item.Name); |
1432 | bulkUpdate.ItemData[0].NextOwnerMask = item.inventoryNextPermissions; | 1432 | bulkUpdate.ItemData[0].NextOwnerMask = item.NextPermissions; |
1433 | bulkUpdate.ItemData[0].OwnerID = item.avatarID; | 1433 | bulkUpdate.ItemData[0].OwnerID = item.Owner; |
1434 | bulkUpdate.ItemData[0].OwnerMask = item.inventoryCurrentPermissions; | 1434 | bulkUpdate.ItemData[0].OwnerMask = item.CurrentPermissions; |
1435 | bulkUpdate.ItemData[0].SalePrice = 100; | 1435 | bulkUpdate.ItemData[0].SalePrice = 100; |
1436 | bulkUpdate.ItemData[0].SaleType = 0; | 1436 | bulkUpdate.ItemData[0].SaleType = 0; |
1437 | bulkUpdate.ItemData[0].Type = (sbyte)item.assetType; | 1437 | bulkUpdate.ItemData[0].Type = (sbyte)item.AssetType; |
1438 | bulkUpdate.ItemData[0].CRC = | 1438 | bulkUpdate.ItemData[0].CRC = |
1439 | Helpers.InventoryCRC(1000, 0, bulkUpdate.ItemData[0].InvType, | 1439 | Helpers.InventoryCRC(1000, 0, bulkUpdate.ItemData[0].InvType, |
1440 | bulkUpdate.ItemData[0].Type, bulkUpdate.ItemData[0].AssetID, | 1440 | bulkUpdate.ItemData[0].Type, bulkUpdate.ItemData[0].AssetID, |
@@ -1461,25 +1461,25 @@ namespace OpenSim.Region.ClientStack | |||
1461 | InventoryReply.AgentData.SimApproved = true; | 1461 | InventoryReply.AgentData.SimApproved = true; |
1462 | InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1]; | 1462 | InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1]; |
1463 | InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock(); | 1463 | InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock(); |
1464 | InventoryReply.InventoryData[0].ItemID = Item.inventoryID; | 1464 | InventoryReply.InventoryData[0].ItemID = Item.ID; |
1465 | InventoryReply.InventoryData[0].AssetID = Item.assetID; | 1465 | InventoryReply.InventoryData[0].AssetID = Item.AssetID; |
1466 | InventoryReply.InventoryData[0].CreatorID = Item.creatorsID; | 1466 | InventoryReply.InventoryData[0].CreatorID = Item.Creator; |
1467 | InventoryReply.InventoryData[0].BaseMask = Item.inventoryBasePermissions; | 1467 | InventoryReply.InventoryData[0].BaseMask = Item.BasePermissions; |
1468 | InventoryReply.InventoryData[0].CreationDate = 1000; | 1468 | InventoryReply.InventoryData[0].CreationDate = 1000; |
1469 | InventoryReply.InventoryData[0].Description = Helpers.StringToField(Item.inventoryDescription); | 1469 | InventoryReply.InventoryData[0].Description = Helpers.StringToField(Item.Description); |
1470 | InventoryReply.InventoryData[0].EveryoneMask = Item.inventoryEveryOnePermissions; | 1470 | InventoryReply.InventoryData[0].EveryoneMask = Item.EveryOnePermissions; |
1471 | InventoryReply.InventoryData[0].Flags = 0; | 1471 | InventoryReply.InventoryData[0].Flags = 0; |
1472 | InventoryReply.InventoryData[0].FolderID = Item.parentFolderID; | 1472 | InventoryReply.InventoryData[0].FolderID = Item.Folder; |
1473 | InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000"); | 1473 | InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000"); |
1474 | InventoryReply.InventoryData[0].GroupMask = 0; | 1474 | InventoryReply.InventoryData[0].GroupMask = 0; |
1475 | InventoryReply.InventoryData[0].InvType = (sbyte)Item.invType; | 1475 | InventoryReply.InventoryData[0].InvType = (sbyte)Item.InvType; |
1476 | InventoryReply.InventoryData[0].Name = Helpers.StringToField(Item.inventoryName); | 1476 | InventoryReply.InventoryData[0].Name = Helpers.StringToField(Item.Name); |
1477 | InventoryReply.InventoryData[0].NextOwnerMask = Item.inventoryNextPermissions; | 1477 | InventoryReply.InventoryData[0].NextOwnerMask = Item.NextPermissions; |
1478 | InventoryReply.InventoryData[0].OwnerID = Item.avatarID; | 1478 | InventoryReply.InventoryData[0].OwnerID = Item.Owner; |
1479 | InventoryReply.InventoryData[0].OwnerMask = Item.inventoryCurrentPermissions; | 1479 | InventoryReply.InventoryData[0].OwnerMask = Item.CurrentPermissions; |
1480 | InventoryReply.InventoryData[0].SalePrice = 100; | 1480 | InventoryReply.InventoryData[0].SalePrice = 100; |
1481 | InventoryReply.InventoryData[0].SaleType = 0; | 1481 | InventoryReply.InventoryData[0].SaleType = 0; |
1482 | InventoryReply.InventoryData[0].Type = (sbyte)Item.assetType; | 1482 | InventoryReply.InventoryData[0].Type = (sbyte)Item.AssetType; |
1483 | InventoryReply.InventoryData[0].CRC = | 1483 | InventoryReply.InventoryData[0].CRC = |
1484 | Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, | 1484 | Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, |
1485 | InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, | 1485 | InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, |