aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
authorSean Dague2008-04-07 23:15:35 +0000
committerSean Dague2008-04-07 23:15:35 +0000
commitf43681510725f5b95fcb864a1f3e4b744fcaf992 (patch)
tree2d34caa75488d1c608d1a21b4888cb0f264a6cba /OpenSim/Region/Environment/Modules
parentneeded to add 4 characters to support the dashes (diff)
downloadopensim-SC_OLD-f43681510725f5b95fcb864a1f3e4b744fcaf992.zip
opensim-SC_OLD-f43681510725f5b95fcb864a1f3e4b744fcaf992.tar.gz
opensim-SC_OLD-f43681510725f5b95fcb864a1f3e4b744fcaf992.tar.bz2
opensim-SC_OLD-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 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/AgentAssetsTransactions.cs36
2 files changed, 19 insertions, 19 deletions
diff --git a/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs b/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs
index 0789b3c..7ae3eba 100644
--- a/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs
+++ b/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs
@@ -232,7 +232,7 @@ namespace OpenSim.Region.Environment.Modules
232 { 232 {
233 m_log.DebugFormat( 233 m_log.DebugFormat(
234 "[TRANSACTIONS MANAGER] Called HandleItemUpdateFromTransaction with item {0}", 234 "[TRANSACTIONS MANAGER] Called HandleItemUpdateFromTransaction with item {0}",
235 item.inventoryName); 235 item.Name);
236 236
237 AgentAssetTransactions transactions 237 AgentAssetTransactions transactions
238 = GetUserTransactions(remoteClient.AgentId); 238 = GetUserTransactions(remoteClient.AgentId);
diff --git a/OpenSim/Region/Environment/Modules/AgentAssetsTransactions.cs b/OpenSim/Region/Environment/Modules/AgentAssetsTransactions.cs
index caba071..4d2ec5b 100644
--- a/OpenSim/Region/Environment/Modules/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/Environment/Modules/AgentAssetsTransactions.cs
@@ -342,7 +342,7 @@ namespace OpenSim.Region.Environment.Modules
342 342
343 AssetBase asset 343 AssetBase asset
344 = m_userTransactions.Manager.MyScene.CommsManager.AssetCache.GetAsset( 344 = m_userTransactions.Manager.MyScene.CommsManager.AssetCache.GetAsset(
345 assetID, (item.assetType == (int) AssetType.Texture ? true : false)); 345 assetID, (item.AssetType == (int) AssetType.Texture ? true : false));
346 346
347 if (asset == null) 347 if (asset == null)
348 { 348 {
@@ -351,11 +351,11 @@ namespace OpenSim.Region.Environment.Modules
351 351
352 if (asset != null && asset.FullID == assetID) 352 if (asset != null && asset.FullID == assetID)
353 { 353 {
354 asset.Name = item.inventoryName; 354 asset.Name = item.Name;
355 asset.Description = item.inventoryDescription; 355 asset.Description = item.Description;
356 asset.InvType = (sbyte) item.invType; 356 asset.InvType = (sbyte) item.InvType;
357 asset.Type = (sbyte) item.assetType; 357 asset.Type = (sbyte) item.AssetType;
358 item.assetID = asset.FullID; 358 item.AssetID = asset.FullID;
359 359
360 m_userTransactions.Manager.MyScene.CommsManager.AssetCache.AddAsset(Asset); 360 m_userTransactions.Manager.MyScene.CommsManager.AssetCache.AddAsset(Asset);
361 } 361 }
@@ -374,18 +374,18 @@ namespace OpenSim.Region.Environment.Modules
374 if (userInfo != null) 374 if (userInfo != null)
375 { 375 {
376 InventoryItemBase item = new InventoryItemBase(); 376 InventoryItemBase item = new InventoryItemBase();
377 item.avatarID = ourClient.AgentId; 377 item.Owner = ourClient.AgentId;
378 item.creatorsID = ourClient.AgentId; 378 item.Creator = ourClient.AgentId;
379 item.inventoryID = LLUUID.Random(); 379 item.ID = LLUUID.Random();
380 item.assetID = Asset.FullID; 380 item.AssetID = Asset.FullID;
381 item.inventoryDescription = m_description; 381 item.Description = m_description;
382 item.inventoryName = m_name; 382 item.Name = m_name;
383 item.assetType = type; 383 item.AssetType = type;
384 item.invType = invType; 384 item.InvType = invType;
385 item.parentFolderID = InventFolder; 385 item.Folder = InventFolder;
386 item.inventoryBasePermissions = 2147483647; 386 item.BasePermissions = 2147483647;
387 item.inventoryCurrentPermissions = 2147483647; 387 item.CurrentPermissions = 2147483647;
388 item.inventoryNextPermissions = nextPerm; 388 item.NextPermissions = nextPerm;
389 389
390 userInfo.AddItem(ourClient.AgentId, item); 390 userInfo.AddItem(ourClient.AgentId, item);
391 ourClient.SendInventoryItemCreateUpdate(item); 391 ourClient.SendInventoryItemCreateUpdate(item);