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/Grid/AssetServer | |
parent | Rename IAssetProviderPlugin to IAssetDataPlugin aligning with the other data ... (diff) | |
download | opensim-SC_OLD-e12b0a249674bbe4b1980c74f13d8f09cc2e4432.zip opensim-SC_OLD-e12b0a249674bbe4b1980c74f13d8f09cc2e4432.tar.gz opensim-SC_OLD-e12b0a249674bbe4b1980c74f13d8f09cc2e4432.tar.bz2 opensim-SC_OLD-e12b0a249674bbe4b1980c74f13d8f09cc2e4432.tar.xz |
- move IAssetDataPlugin from OpenSim/Framework/IAssetProvider.cs to
OpenSim/Data/IAssetData.cs
- remove some trailing whitespace
Diffstat (limited to 'OpenSim/Grid/AssetServer')
-rw-r--r-- | OpenSim/Grid/AssetServer/Main.cs | 1 | ||||
-rw-r--r-- | OpenSim/Grid/AssetServer/RestService.cs | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs index b5c8df0..07fe0a4 100644 --- a/OpenSim/Grid/AssetServer/Main.cs +++ b/OpenSim/Grid/AssetServer/Main.cs | |||
@@ -36,6 +36,7 @@ using OpenSim.Framework.AssetLoader.Filesystem; | |||
36 | using OpenSim.Framework.Console; | 36 | using OpenSim.Framework.Console; |
37 | using OpenSim.Framework.Servers; | 37 | using OpenSim.Framework.Servers; |
38 | using OpenSim.Framework.Statistics; | 38 | using OpenSim.Framework.Statistics; |
39 | using OpenSim.Data; | ||
39 | 40 | ||
40 | namespace OpenSim.Grid.AssetServer | 41 | namespace OpenSim.Grid.AssetServer |
41 | { | 42 | { |
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs index e81cb3f..3613cd8 100644 --- a/OpenSim/Grid/AssetServer/RestService.cs +++ b/OpenSim/Grid/AssetServer/RestService.cs | |||
@@ -37,6 +37,7 @@ using log4net; | |||
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Framework.Servers; | 38 | using OpenSim.Framework.Servers; |
39 | using OpenSim.Framework.Statistics; | 39 | using OpenSim.Framework.Statistics; |
40 | using OpenSim.Data; | ||
40 | 41 | ||
41 | namespace OpenSim.Grid.AssetServer | 42 | namespace OpenSim.Grid.AssetServer |
42 | { | 43 | { |
@@ -98,7 +99,7 @@ namespace OpenSim.Grid.AssetServer | |||
98 | result = ms.GetBuffer(); | 99 | result = ms.GetBuffer(); |
99 | 100 | ||
100 | //Ckrinke 1/11/09 Commenting out the succesful REST message as under heavy use there | 101 | //Ckrinke 1/11/09 Commenting out the succesful REST message as under heavy use there |
101 | //are multiple messages in a second and that is usually (in my experience) meaning | 102 | //are multiple messages in a second and that is usually (in my experience) meaning |
102 | //the logging itself is slowing down the program. Leaving the unsuccesful message | 103 | //the logging itself is slowing down the program. Leaving the unsuccesful message |
103 | //as we need to know about that path. | 104 | //as we need to know about that path. |
104 | // m_log.InfoFormat( | 105 | // m_log.InfoFormat( |