aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2015-01-22 23:12:10 +0000
committerJustin Clark-Casey (justincc)2015-01-23 00:27:57 +0000
commitd0a2ea0857c1342a42db31bce282c62c88c57e55 (patch)
treeb727ce53574216d12cc6549e74982ce5de850654 /OpenSim/Region/CoreModules
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-d0a2ea0857c1342a42db31bce282c62c88c57e55.zip
opensim-SC-d0a2ea0857c1342a42db31bce282c62c88c57e55.tar.gz
opensim-SC-d0a2ea0857c1342a42db31bce282c62c88c57e55.tar.bz2
opensim-SC-d0a2ea0857c1342a42db31bce282c62c88c57e55.tar.xz
Fix regression where the stored state of every second script in an object rezzed from inventory (e.g. attachments) was no longer loaded.
Likely a regression since f132f642 (2014-08-28) Relates to http://opensimulator.org/mantis/view.php?id=7278
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index f537124..f958510 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -297,6 +297,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
297 { 297 {
298 if (item != null && item.Owner == ownerID && asset != null) 298 if (item != null && item.Owner == ownerID && asset != null)
299 { 299 {
300// m_log.DebugFormat(
301// "[INVENTORY ACCESS MODULE]: Updating item {0} {1} with new asset {2}",
302// item.Name, item.ID, asset.ID);
303
300 item.AssetID = asset.FullID; 304 item.AssetID = asset.FullID;
301 item.Description = asset.Description; 305 item.Description = asset.Description;
302 item.Name = asset.Name; 306 item.Name = asset.Name;
@@ -314,7 +318,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
314 (item == null || asset == null? "null item or asset" : "wrong owner")); 318 (item == null || asset == null? "null item or asset" : "wrong owner"));
315 return false; 319 return false;
316 } 320 }
317
318 } 321 }
319 322
320 public virtual List<InventoryItemBase> CopyToInventory( 323 public virtual List<InventoryItemBase> CopyToInventory(