aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorDiva Canto2015-08-01 18:58:05 -0700
committerDiva Canto2015-08-01 18:58:05 -0700
commite5a1243abc04c3f6f62e94425fea25b2ad84b577 (patch)
tree6b408e3b9cf8bb35a7de9042be8270df3900809f /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parentMantis #7664: Added IHypergridLinker interface to establish a contract about ... (diff)
downloadopensim-SC-e5a1243abc04c3f6f62e94425fea25b2ad84b577.zip
opensim-SC-e5a1243abc04c3f6f62e94425fea25b2ad84b577.tar.gz
opensim-SC-e5a1243abc04c3f6f62e94425fea25b2ad84b577.tar.bz2
opensim-SC-e5a1243abc04c3f6f62e94425fea25b2ad84b577.tar.xz
Mantis #7657 and #7514. This should alleviate the problem of bad object assets being passed around via HG and archives. No guarantees that all the leaks have been found, but at least it detects and fixes these bad assets upon:
(1) storing and getting assets over HG -- assuming the core HG asset service is being used (not the case with OSGrid!) (2) importing assets via OAR and IAR Instantiation of bad assets now should also work, instead of producing an exception, but the bad assets themselves aren't being fixed in the DB. That should be done with a cleaning tool -- see Perl script in Mantis #7657. Virus!
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index c14ce1e..dde54d5 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -37,6 +37,7 @@ using OpenMetaverse;
37using OpenMetaverse.Packets; 37using OpenMetaverse.Packets;
38using log4net; 38using log4net;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Framework.Serialization.External;
40using OpenSim.Region.Framework; 41using OpenSim.Region.Framework;
41using OpenSim.Framework.Client; 42using OpenSim.Framework.Client;
42using OpenSim.Region.Framework.Interfaces; 43using OpenSim.Region.Framework.Interfaces;
@@ -2225,7 +2226,7 @@ namespace OpenSim.Region.Framework.Scenes
2225 bbox = Vector3.Zero; 2226 bbox = Vector3.Zero;
2226 offsetHeight = 0; 2227 offsetHeight = 0;
2227 2228
2228 string xmlData = Utils.BytesToString(assetData); 2229 string xmlData = ExternalRepresentationUtils.SanitizeXml(Utils.BytesToString(assetData));
2229 2230
2230 try 2231 try
2231 { 2232 {