aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authordiva2009-03-28 23:50:37 +0000
committerdiva2009-03-28 23:50:37 +0000
commit730b78114f2e26be9a39a02785af1ed9fbda44f1 (patch)
tree7fdc91b564fa53315f4d9783cac319ef1584acb6 /OpenSim/Region
parent* Adding some heuristic error correction to the j2k decoder module to combat ... (diff)
downloadopensim-SC_OLD-730b78114f2e26be9a39a02785af1ed9fbda44f1.zip
opensim-SC_OLD-730b78114f2e26be9a39a02785af1ed9fbda44f1.tar.gz
opensim-SC_OLD-730b78114f2e26be9a39a02785af1ed9fbda44f1.tar.bz2
opensim-SC_OLD-730b78114f2e26be9a39a02785af1ed9fbda44f1.tar.xz
Minor bug fix in UpdateItem (meta data).
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs
index 2c218fc..e619f13 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs
@@ -384,6 +384,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
384 m_log.DebugFormat("[HGStandaloneInvService]: Update item {0} from {1}", item.ID, item.Owner); 384 m_log.DebugFormat("[HGStandaloneInvService]: Update item {0} from {1}", item.ID, item.Owner);
385 InventoryItemBase it = m_inventoryService.GetInventoryItem(item.ID); 385 InventoryItemBase it = m_inventoryService.GetInventoryItem(item.ID);
386 item.CurrentPermissions = it.CurrentPermissions; 386 item.CurrentPermissions = it.CurrentPermissions;
387 item.AssetID = it.AssetID;
387 if (m_inventoryService.UpdateItem(item)) 388 if (m_inventoryService.UpdateItem(item))
388 return item; 389 return item;
389 else 390 else
@@ -500,7 +501,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
500 if (theasset != null) 501 if (theasset != null)
501 { 502 {
502 asset = theasset; 503 asset = theasset;
503 m_log.Debug(" >> Sending assetID " + item.AssetID); 504 //m_log.Debug(" >> Sending assetID " + item.AssetID);
504 } 505 }
505 return asset; 506 return asset;
506 } 507 }
@@ -509,6 +510,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
509 { 510 {
510 m_log.Info("[HGStandaloneInvService]: Post asset " + asset.FullID); 511 m_log.Info("[HGStandaloneInvService]: Post asset " + asset.FullID);
511 m_assetProvider.CreateAsset(asset); 512 m_assetProvider.CreateAsset(asset);
513
512 return true; 514 return true;
513 } 515 }
514 516