1 files changed, 114 insertions, 114 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
index f41be49..ebcbcc7 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
@@ -1,114 +1,114 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Environment.Scenes;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Threading;
+using System.Threading;
-using libsecondlife;
+using libsecondlife;
-namespace OpenSim.Region.Environment.Modules.World.Archiver
+namespace OpenSim.Region.Environment.Modules.World.Archiver
-{
+{
-    /// <summary>
+    /// <summary>
-    /// Encapsulate the asynchronous requests for the assets required for an archive operation
+    /// Encapsulate the asynchronous requests for the assets required for an archive operation
-    /// </summary>
+    /// </summary>
-    class AssetsRequest
+    class AssetsRequest
-    {
+    {
-        /// <summary>
+        /// <summary>
-        /// uuids to request
+        /// uuids to request
-        /// </summary>
+        /// </summary>
-        protected ICollection<LLUUID> m_uuids;
+        protected ICollection<LLUUID> m_uuids;
-        
+        
-        /// <summary>
+        /// <summary>
-        /// Callback used when all the assets requested have been received.
+        /// Callback used when all the assets requested have been received.
-        /// </summary>
+        /// </summary>
-        protected AssetsRequestCallback m_assetsRequestCallback;
+        protected AssetsRequestCallback m_assetsRequestCallback;
-        /// <summary>
+        /// <summary>
-        /// Assets retrieved in this request
+        /// Assets retrieved in this request
-        /// </summary>
+        /// </summary>
-        protected Dictionary<LLUUID, AssetBase> m_assets = new Dictionary<LLUUID, AssetBase>();
+        protected Dictionary<LLUUID, AssetBase> m_assets = new Dictionary<LLUUID, AssetBase>();
-        /// <summary>
+        /// <summary>
-        /// Record the number of asset replies required so we know when we've finished
+        /// Record the number of asset replies required so we know when we've finished
-        /// </summary>
+        /// </summary>
-        private int m_repliesRequired;
+        private int m_repliesRequired;
-        /// <summary>
+        /// <summary>
-        /// Asset cache used to request the assets
+        /// Asset cache used to request the assets
-        /// </summary>
+        /// </summary>
-        protected AssetCache m_assetCache;
+        protected AssetCache m_assetCache;
-        protected internal AssetsRequest(ICollection<LLUUID> uuids, AssetCache assetCache, AssetsRequestCallback assetsRequestCallback)
+        protected internal AssetsRequest(ICollection<LLUUID> uuids, AssetCache assetCache, AssetsRequestCallback assetsRequestCallback)
-        {
+        {
-            m_uuids = uuids;
+            m_uuids = uuids;
-            m_assetsRequestCallback = assetsRequestCallback;
+            m_assetsRequestCallback = assetsRequestCallback;
-            m_assetCache = assetCache;
+            m_assetCache = assetCache;
-            m_repliesRequired = uuids.Count;
+            m_repliesRequired = uuids.Count;
-        }
+        }
-        
+        
-        protected internal void Execute()
+        protected internal void Execute()
-        {
+        {
-            // We can stop here if there are no assets to fetch
+            // We can stop here if there are no assets to fetch
-            if (m_repliesRequired == 0)
+            if (m_repliesRequired == 0)
-                m_assetsRequestCallback(m_assets);
+                m_assetsRequestCallback(m_assets);
-            foreach (LLUUID uuid in m_uuids)
+            foreach (LLUUID uuid in m_uuids)
-            {
+            {
-                m_assetCache.GetAsset(uuid, AssetRequestCallback, true);
+                m_assetCache.GetAsset(uuid, AssetRequestCallback, true);
-            }
+            }
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Called back by the asset cache when it has the asset
+        /// Called back by the asset cache when it has the asset
-        /// </summary>
+        /// </summary>
-        /// <param name="assetID"></param>
+        /// <param name="assetID"></param>
-        /// <param name="asset"></param>
+        /// <param name="asset"></param>
-        public void AssetRequestCallback(LLUUID assetID, AssetBase asset)
+        public void AssetRequestCallback(LLUUID assetID, AssetBase asset)
-        {
+        {
-            m_assets[assetID] = asset;
+            m_assets[assetID] = asset;
-            if (m_assets.Count == m_repliesRequired)
+            if (m_assets.Count == m_repliesRequired)
-            {
+            {
-                // We want to stop using the asset cache thread asap as we now need to do the actual work of producing the archive
+                // We want to stop using the asset cache thread asap as we now need to do the actual work of producing the archive
-                Thread newThread = new Thread(PerformAssetsRequestCallback);
+                Thread newThread = new Thread(PerformAssetsRequestCallback);
-                newThread.Name = "OpenSimulator archiving thread post assets receipt";
+                newThread.Name = "OpenSimulator archiving thread post assets receipt";
-                newThread.Start();
+                newThread.Start();
-            }
+            }
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Perform the callback on the original requester of the assets
+        /// Perform the callback on the original requester of the assets
-        /// </summary>
+        /// </summary>
-        protected void PerformAssetsRequestCallback()
+        protected void PerformAssetsRequestCallback()
-        {
+        {
-            m_assetsRequestCallback(m_assets);
+            m_assetsRequestCallback(m_assets);
-        }
+        }
-    }
+    }
-}
+}

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs index f41be49..ebcbcc7 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
@@ -1,114 +1,114 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://opensimulator.org/	2	* Copyright (c) Contributors, http://opensimulator.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSim Project nor the	12	* * Neither the name of the OpenSim Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*/	26	*/
27		27
28	using OpenSim.Framework;	28	using OpenSim.Framework;
29	using OpenSim.Framework.Communications.Cache;	29	using OpenSim.Framework.Communications.Cache;
30	using OpenSim.Region.Environment.Interfaces;	30	using OpenSim.Region.Environment.Interfaces;
31	using OpenSim.Region.Environment.Scenes;	31	using OpenSim.Region.Environment.Scenes;
32	using System.Collections.Generic;	32	using System.Collections.Generic;
33	using System.Threading;	33	using System.Threading;
34	using libsecondlife;	34	using libsecondlife;
35		35
36	namespace OpenSim.Region.Environment.Modules.World.Archiver	36	namespace OpenSim.Region.Environment.Modules.World.Archiver
37	{	37	{
38	/// <summary>	38	/// <summary>
39	/// Encapsulate the asynchronous requests for the assets required for an archive operation	39	/// Encapsulate the asynchronous requests for the assets required for an archive operation
40	/// </summary>	40	/// </summary>
41	class AssetsRequest	41	class AssetsRequest
42	{	42	{
43	/// <summary>	43	/// <summary>
44	/// uuids to request	44	/// uuids to request
45	/// </summary>	45	/// </summary>
46	protected ICollection<LLUUID> m_uuids;	46	protected ICollection<LLUUID> m_uuids;
47		47
48	/// <summary>	48	/// <summary>
49	/// Callback used when all the assets requested have been received.	49	/// Callback used when all the assets requested have been received.
50	/// </summary>	50	/// </summary>
51	protected AssetsRequestCallback m_assetsRequestCallback;	51	protected AssetsRequestCallback m_assetsRequestCallback;
52		52
53	/// <summary>	53	/// <summary>
54	/// Assets retrieved in this request	54	/// Assets retrieved in this request
55	/// </summary>	55	/// </summary>
56	protected Dictionary<LLUUID, AssetBase> m_assets = new Dictionary<LLUUID, AssetBase>();	56	protected Dictionary<LLUUID, AssetBase> m_assets = new Dictionary<LLUUID, AssetBase>();
57		57
58	/// <summary>	58	/// <summary>
59	/// Record the number of asset replies required so we know when we've finished	59	/// Record the number of asset replies required so we know when we've finished
60	/// </summary>	60	/// </summary>
61	private int m_repliesRequired;	61	private int m_repliesRequired;
62		62
63	/// <summary>	63	/// <summary>
64	/// Asset cache used to request the assets	64	/// Asset cache used to request the assets
65	/// </summary>	65	/// </summary>
66	protected AssetCache m_assetCache;	66	protected AssetCache m_assetCache;
67		67
68	protected internal AssetsRequest(ICollection<LLUUID> uuids, AssetCache assetCache, AssetsRequestCallback assetsRequestCallback)	68	protected internal AssetsRequest(ICollection<LLUUID> uuids, AssetCache assetCache, AssetsRequestCallback assetsRequestCallback)
69	{	69	{
70	m_uuids = uuids;	70	m_uuids = uuids;
71	m_assetsRequestCallback = assetsRequestCallback;	71	m_assetsRequestCallback = assetsRequestCallback;
72	m_assetCache = assetCache;	72	m_assetCache = assetCache;
73	m_repliesRequired = uuids.Count;	73	m_repliesRequired = uuids.Count;
74	}	74	}
75		75
76	protected internal void Execute()	76	protected internal void Execute()
77	{	77	{
78	// We can stop here if there are no assets to fetch	78	// We can stop here if there are no assets to fetch
79	if (m_repliesRequired == 0)	79	if (m_repliesRequired == 0)
80	m_assetsRequestCallback(m_assets);	80	m_assetsRequestCallback(m_assets);
81		81
82	foreach (LLUUID uuid in m_uuids)	82	foreach (LLUUID uuid in m_uuids)
83	{	83	{
84	m_assetCache.GetAsset(uuid, AssetRequestCallback, true);	84	m_assetCache.GetAsset(uuid, AssetRequestCallback, true);
85	}	85	}
86	}	86	}
87		87
88	/// <summary>	88	/// <summary>
89	/// Called back by the asset cache when it has the asset	89	/// Called back by the asset cache when it has the asset
90	/// </summary>	90	/// </summary>
91	/// <param name="assetID"></param>	91	/// <param name="assetID"></param>
92	/// <param name="asset"></param>	92	/// <param name="asset"></param>
93	public void AssetRequestCallback(LLUUID assetID, AssetBase asset)	93	public void AssetRequestCallback(LLUUID assetID, AssetBase asset)
94	{	94	{
95	m_assets[assetID] = asset;	95	m_assets[assetID] = asset;
96		96
97	if (m_assets.Count == m_repliesRequired)	97	if (m_assets.Count == m_repliesRequired)
98	{	98	{
99	// We want to stop using the asset cache thread asap as we now need to do the actual work of producing the archive	99	// We want to stop using the asset cache thread asap as we now need to do the actual work of producing the archive
100	Thread newThread = new Thread(PerformAssetsRequestCallback);	100	Thread newThread = new Thread(PerformAssetsRequestCallback);
101	newThread.Name = "OpenSimulator archiving thread post assets receipt";	101	newThread.Name = "OpenSimulator archiving thread post assets receipt";
102	newThread.Start();	102	newThread.Start();
103	}	103	}
104	}	104	}
105		105
106	/// <summary>	106	/// <summary>
107	/// Perform the callback on the original requester of the assets	107	/// Perform the callback on the original requester of the assets
108	/// </summary>	108	/// </summary>
109	protected void PerformAssetsRequestCallback()	109	protected void PerformAssetsRequestCallback()
110	{	110	{
111	m_assetsRequestCallback(m_assets);	111	m_assetsRequestCallback(m_assets);
112	}	112	}
113	}	113	}
114	}	114	}