1 files changed, 59 insertions, 59 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
index 2868b77..3bf714e 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
@@ -1,59 +1,59 @@
-/**
+/**
- * Copyright (c) 2008, Contributors. All rights reserved.
+ * Copyright (c) 2008, Contributors. All rights reserved.
- * 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 modification, 
+ * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met:
+ * are permitted provided that the following conditions are met:
- * 
+ * 
- *     * Redistributions of source code must retain the above copyright notice, 
+ *     * Redistributions of source code must retain the above copyright notice, 
- *       this list of conditions and the following disclaimer.
+ *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright notice, 
+ *     * Redistributions in binary form must reproduce the above copyright notice, 
- *       this list of conditions and the following disclaimer in the documentation 
+ *       this list of conditions and the following disclaimer in the documentation 
- *       and/or other materials provided with the distribution.
+ *       and/or other materials provided with the distribution.
- *     * Neither the name of the Organizations nor the names of Individual
+ *     * Neither the name of the Organizations nor the names of Individual
- *       Contributors may be used to endorse or promote products derived from 
+ *       Contributors may be used to endorse or promote products derived from 
- *       this software without specific prior written permission.
+ *       this software without specific prior written permission.
- * 
+ * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
- * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ * AND 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 SOFTWARE, EVEN IF ADVISED 
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
- * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ * 
- */
+ */
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Framework.Communications;
+using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Communications.Local;
+using OpenSim.Region.Communications.Local;
-using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers;
-namespace OpenSim.Region.Communications.Hypergrid
+namespace OpenSim.Region.Communications.Hypergrid
-{
+{
-    public class HGCommunicationsStandalone : CommunicationsLocal
+    public class HGCommunicationsStandalone : CommunicationsLocal
-    {
+    {
-        public HGCommunicationsStandalone(
+        public HGCommunicationsStandalone(
-            NetworkServersInfo serversInfo,
+            NetworkServersInfo serversInfo,
-            BaseHttpServer httpServer,
+            BaseHttpServer httpServer,
-            AssetCache assetCache,
+            AssetCache assetCache,
-            IUserService userService,
+            IUserService userService,
-            IUserServiceAdmin userServiceAdmin,
+            IUserServiceAdmin userServiceAdmin,
-            LocalInventoryService inventoryService,
+            LocalInventoryService inventoryService,
-            IInterRegionCommunications interRegionService,
+            IInterRegionCommunications interRegionService,
-            HGGridServices gridService, IMessagingService messageService, LibraryRootFolder libraryRootFolder, bool dumpAssetsToFile)
+            HGGridServices gridService, IMessagingService messageService, LibraryRootFolder libraryRootFolder, bool dumpAssetsToFile)
-            : base(serversInfo, httpServer, assetCache, userService, userServiceAdmin, inventoryService, interRegionService, gridService, messageService, libraryRootFolder, dumpAssetsToFile)
+            : base(serversInfo, httpServer, assetCache, userService, userServiceAdmin, inventoryService, interRegionService, gridService, messageService, libraryRootFolder, dumpAssetsToFile)
-        {
+        {
-            gridService.UserProfileCache = m_userProfileCacheService;
+            gridService.UserProfileCache = m_userProfileCacheService;
-            m_assetCache = assetCache;
+            m_assetCache = assetCache;
-            // Let's swap to always be secure access to inventory
+            // Let's swap to always be secure access to inventory
-            AddSecureInventoryService((ISecureInventoryService)inventoryService);
+            AddSecureInventoryService((ISecureInventoryService)inventoryService);
-            m_inventoryServices = null;
+            m_inventoryServices = null;
-        }
+        }
-    }
+    }
-}
+}

diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs index 2868b77..3bf714e 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
@@ -1,59 +1,59 @@
1	/**	1	/**
2	* Copyright (c) 2008, Contributors. All rights reserved.	2	* Copyright (c) 2008, Contributors. All rights reserved.
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 modification,	5	* Redistribution and use in source and binary forms, with or without modification,
6	* are permitted provided that the following conditions are met:	6	* are permitted provided that the following conditions are met:
7	*	7	*
8	* * Redistributions of source code must retain the above copyright notice,	8	* * Redistributions of source code must retain the above copyright notice,
9	* this list of conditions and the following disclaimer.	9	* this list of conditions and the following disclaimer.
10	* * Redistributions in binary form must reproduce the above copyright notice,	10	* * Redistributions in binary form must reproduce the above copyright notice,
11	* this list of conditions and the following disclaimer in the documentation	11	* this list of conditions and the following disclaimer in the documentation
12	* and/or other materials provided with the distribution.	12	* and/or other materials provided with the distribution.
13	* * Neither the name of the Organizations nor the names of Individual	13	* * Neither the name of the Organizations nor the names of Individual
14	* Contributors may be used to endorse or promote products derived from	14	* Contributors may be used to endorse or promote products derived from
15	* this software without specific prior written permission.	15	* this software without specific prior written permission.
16	*	16	*
17	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND	17	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
18	* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES	18	* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
19	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL	19	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
20	* THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,	20	* THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
21	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE	21	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
22	* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED	22	* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
23	* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING	23	* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
24	* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED	24	* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
25	* OF THE POSSIBILITY OF SUCH DAMAGE.	25	* OF THE POSSIBILITY OF SUCH DAMAGE.
26	*	26	*
27	*/	27	*/
28		28
29		29
30	using OpenSim.Framework;	30	using OpenSim.Framework;
31	using OpenSim.Framework.Communications;	31	using OpenSim.Framework.Communications;
32	using OpenSim.Framework.Communications.Cache;	32	using OpenSim.Framework.Communications.Cache;
33	using OpenSim.Region.Communications.Local;	33	using OpenSim.Region.Communications.Local;
34	using OpenSim.Framework.Servers;	34	using OpenSim.Framework.Servers;
35		35
36	namespace OpenSim.Region.Communications.Hypergrid	36	namespace OpenSim.Region.Communications.Hypergrid
37	{	37	{
38	public class HGCommunicationsStandalone : CommunicationsLocal	38	public class HGCommunicationsStandalone : CommunicationsLocal
39	{	39	{
40	public HGCommunicationsStandalone(	40	public HGCommunicationsStandalone(
41	NetworkServersInfo serversInfo,	41	NetworkServersInfo serversInfo,
42	BaseHttpServer httpServer,	42	BaseHttpServer httpServer,
43	AssetCache assetCache,	43	AssetCache assetCache,
44	IUserService userService,	44	IUserService userService,
45	IUserServiceAdmin userServiceAdmin,	45	IUserServiceAdmin userServiceAdmin,
46	LocalInventoryService inventoryService,	46	LocalInventoryService inventoryService,
47	IInterRegionCommunications interRegionService,	47	IInterRegionCommunications interRegionService,
48	HGGridServices gridService, IMessagingService messageService, LibraryRootFolder libraryRootFolder, bool dumpAssetsToFile)	48	HGGridServices gridService, IMessagingService messageService, LibraryRootFolder libraryRootFolder, bool dumpAssetsToFile)
49	: base(serversInfo, httpServer, assetCache, userService, userServiceAdmin, inventoryService, interRegionService, gridService, messageService, libraryRootFolder, dumpAssetsToFile)	49	: base(serversInfo, httpServer, assetCache, userService, userServiceAdmin, inventoryService, interRegionService, gridService, messageService, libraryRootFolder, dumpAssetsToFile)
50	{	50	{
51	gridService.UserProfileCache = m_userProfileCacheService;	51	gridService.UserProfileCache = m_userProfileCacheService;
52	m_assetCache = assetCache;	52	m_assetCache = assetCache;
53	// Let's swap to always be secure access to inventory	53	// Let's swap to always be secure access to inventory
54	AddSecureInventoryService((ISecureInventoryService)inventoryService);	54	AddSecureInventoryService((ISecureInventoryService)inventoryService);
55	m_inventoryServices = null;	55	m_inventoryServices = null;
56	}	56	}
57		57
58	}	58	}
59	}	59	}