aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/AssetServer
diff options
context:
space:
mode:
authorDr Scofield2008-06-27 23:03:39 +0000
committerDr Scofield2008-06-27 23:03:39 +0000
commit748f72326d9a295958bc9ba63bbb1a5d39030ef7 (patch)
tree58f2c9a5f6b8ffab5ad3621070aa17cb1c1e3e6b /OpenSim/Grid/AssetServer
parentmore warnings to go. (diff)
downloadopensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.zip
opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.gz
opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.bz2
opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.xz
last round of warning squashing. calling it a day now.
Diffstat (limited to 'OpenSim/Grid/AssetServer')
-rw-r--r--OpenSim/Grid/AssetServer/RestService.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index e0e5656..98f86f1 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Grid.AssetServer
44 { 44 {
45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 46
47 private OpenAsset_Main m_assetManager; 47 // private OpenAsset_Main m_assetManager;
48 private IAssetProvider m_assetProvider; 48 private IAssetProvider m_assetProvider;
49 49
50 /// <summary> 50 /// <summary>
@@ -56,7 +56,7 @@ namespace OpenSim.Grid.AssetServer
56 : base("GET", "/assets") 56 : base("GET", "/assets")
57 { 57 {
58 m_log.Info("[REST]: In Get Request"); 58 m_log.Info("[REST]: In Get Request");
59 m_assetManager = assetManager; 59 // m_assetManager = assetManager;
60 m_assetProvider = assetProvider; 60 m_assetProvider = assetProvider;
61 } 61 }
62 62
@@ -120,7 +120,7 @@ namespace OpenSim.Grid.AssetServer
120 { 120 {
121 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 121 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
122 122
123 private OpenAsset_Main m_assetManager; 123 // private OpenAsset_Main m_assetManager;
124 private IAssetProvider m_assetProvider; 124 private IAssetProvider m_assetProvider;
125 125
126 public override byte[] Handle(string path, Stream request, 126 public override byte[] Handle(string path, Stream request,
@@ -131,7 +131,7 @@ namespace OpenSim.Grid.AssetServer
131 LLUUID assetId; 131 LLUUID assetId;
132 if (param.Length > 0) 132 if (param.Length > 0)
133 LLUUID.TryParse(param, out assetId); 133 LLUUID.TryParse(param, out assetId);
134 byte[] txBuffer = new byte[4096]; 134 // byte[] txBuffer = new byte[4096];
135 135
136 XmlSerializer xs = new XmlSerializer(typeof (AssetBase)); 136 XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
137 AssetBase asset = (AssetBase) xs.Deserialize(request); 137 AssetBase asset = (AssetBase) xs.Deserialize(request);
@@ -146,7 +146,7 @@ namespace OpenSim.Grid.AssetServer
146 public PostAssetStreamHandler(OpenAsset_Main assetManager, IAssetProvider assetProvider) 146 public PostAssetStreamHandler(OpenAsset_Main assetManager, IAssetProvider assetProvider)
147 : base("POST", "/assets") 147 : base("POST", "/assets")
148 { 148 {
149 m_assetManager = assetManager; 149 // m_assetManager = assetManager;
150 m_assetProvider = assetProvider; 150 m_assetProvider = assetProvider;
151 } 151 }
152 } 152 }