aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorMike Mazur2009-02-03 05:20:16 +0000
committerMike Mazur2009-02-03 05:20:16 +0000
commite12b0a249674bbe4b1980c74f13d8f09cc2e4432 (patch)
treeecbc9a25faf6dd40b05b9435ad24d6a36b4a3b62 /OpenSim/Grid
parentRename IAssetProviderPlugin to IAssetDataPlugin aligning with the other data ... (diff)
downloadopensim-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')
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs1
-rw-r--r--OpenSim/Grid/AssetServer/RestService.cs3
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;
36using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
37using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
38using OpenSim.Framework.Statistics; 38using OpenSim.Framework.Statistics;
39using OpenSim.Data;
39 40
40namespace OpenSim.Grid.AssetServer 41namespace 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;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
39using OpenSim.Framework.Statistics; 39using OpenSim.Framework.Statistics;
40using OpenSim.Data;
40 41
41namespace OpenSim.Grid.AssetServer 42namespace 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(