diff options
author | Mike Mazur | 2009-02-03 05:20:16 +0000 |
---|---|---|
committer | Mike Mazur | 2009-02-03 05:20:16 +0000 |
commit | e12b0a249674bbe4b1980c74f13d8f09cc2e4432 (patch) | |
tree | ecbc9a25faf6dd40b05b9435ad24d6a36b4a3b62 /OpenSim/Region/Environment/Modules/Hypergrid | |
parent | Rename IAssetProviderPlugin to IAssetDataPlugin aligning with the other data ... (diff) | |
download | opensim-SC-e12b0a249674bbe4b1980c74f13d8f09cc2e4432.zip opensim-SC-e12b0a249674bbe4b1980c74f13d8f09cc2e4432.tar.gz opensim-SC-e12b0a249674bbe4b1980c74f13d8f09cc2e4432.tar.bz2 opensim-SC-e12b0a249674bbe4b1980c74f13d8f09cc2e4432.tar.xz |
- move IAssetDataPlugin from OpenSim/Framework/IAssetProvider.cs to
OpenSim/Data/IAssetData.cs
- remove some trailing whitespace
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Hypergrid')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs b/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs index 24de4e8..285a019 100644 --- a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs +++ b/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs | |||
@@ -1,29 +1,29 @@ | |||
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 | using System; | 29 | using System; |
@@ -43,6 +43,7 @@ using OpenSim.Framework.Servers; | |||
43 | using OpenSim.Region.Environment.Interfaces; | 43 | using OpenSim.Region.Environment.Interfaces; |
44 | using OpenSim.Region.Environment.Scenes; | 44 | using OpenSim.Region.Environment.Scenes; |
45 | using OpenSim.Grid.AssetServer; | 45 | using OpenSim.Grid.AssetServer; |
46 | using OpenSim.Data; | ||
46 | 47 | ||
47 | namespace OpenSim.Region.Environment.Modules.Hypergrid | 48 | namespace OpenSim.Region.Environment.Modules.Hypergrid |
48 | { | 49 | { |
@@ -51,10 +52,10 @@ namespace OpenSim.Region.Environment.Modules.Hypergrid | |||
51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 52 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
52 | private static bool initialized = false; | 53 | private static bool initialized = false; |
53 | private static bool enabled = false; | 54 | private static bool enabled = false; |
54 | 55 | ||
55 | Scene m_scene; | 56 | Scene m_scene; |
56 | //AssetService m_assetService; | 57 | //AssetService m_assetService; |
57 | 58 | ||
58 | #region IRegionModule interface | 59 | #region IRegionModule interface |
59 | 60 | ||
60 | public void Initialise(Scene scene, IConfigSource config) | 61 | public void Initialise(Scene scene, IConfigSource config) |
@@ -98,7 +99,7 @@ namespace OpenSim.Region.Environment.Modules.Hypergrid | |||
98 | 99 | ||
99 | } | 100 | } |
100 | 101 | ||
101 | public class AssetService | 102 | public class AssetService |
102 | { | 103 | { |
103 | private IUserService m_userService; | 104 | private IUserService m_userService; |
104 | private bool m_doLookup = false; | 105 | private bool m_doLookup = false; |
@@ -120,8 +121,8 @@ namespace OpenSim.Region.Environment.Modules.Hypergrid | |||
120 | protected void AddHttpHandlers(Scene m_scene) | 121 | protected void AddHttpHandlers(Scene m_scene) |
121 | { | 122 | { |
122 | IAssetDataPlugin m_assetProvider = ((AssetServerBase)m_scene.AssetCache.AssetServer).AssetProviderPlugin; | 123 | IAssetDataPlugin m_assetProvider = ((AssetServerBase)m_scene.AssetCache.AssetServer).AssetProviderPlugin; |
123 | 124 | ||
124 | BaseHttpServer httpServer = m_scene.CommsManager.HttpServer; | 125 | BaseHttpServer httpServer = m_scene.CommsManager.HttpServer; |
125 | httpServer.AddStreamHandler(new GetAssetStreamHandler(m_assetProvider)); | 126 | httpServer.AddStreamHandler(new GetAssetStreamHandler(m_assetProvider)); |
126 | httpServer.AddStreamHandler(new PostAssetStreamHandler(m_assetProvider)); | 127 | httpServer.AddStreamHandler(new PostAssetStreamHandler(m_assetProvider)); |
127 | 128 | ||