aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-04-15 19:46:37 +0000
committerJustin Clarke Casey2009-04-15 19:46:37 +0000
commit9f6b8ec9b029501589516099bb0dde26b0e032a1 (patch)
treeeeb1e2a317b7e26e8e96e95d196fd88b21516e63 /OpenSim/Framework
parent* Make it possible to add a request id to load and save oar requests (diff)
downloadopensim-SC-9f6b8ec9b029501589516099bb0dde26b0e032a1.zip
opensim-SC-9f6b8ec9b029501589516099bb0dde26b0e032a1.tar.gz
opensim-SC-9f6b8ec9b029501589516099bb0dde26b0e032a1.tar.bz2
opensim-SC-9f6b8ec9b029501589516099bb0dde26b0e032a1.tar.xz
minor: Remove some mono compiler warnings. Uncomment code when it's actually being used.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Servers/GetAssetStreamHandler.cs44
1 files changed, 22 insertions, 22 deletions
diff --git a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
index ffd7ef4..d7fb72b 100644
--- a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
+++ b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
@@ -86,10 +86,10 @@ namespace OpenSim.Framework.Servers
86 AssetBase asset = m_assetProvider.FetchAsset(assetID); 86 AssetBase asset = m_assetProvider.FetchAsset(assetID);
87 if (asset != null) 87 if (asset != null)
88 { 88 {
89 if (asset.ContainsReferences && false) 89// if (asset.ContainsReferences)
90 { 90// {
91 asset.Data = ProcessOutgoingAssetData(asset.Data); 91// asset.Data = ProcessOutgoingAssetData(asset.Data);
92 } 92// }
93 93
94 XmlSerializer xs = new XmlSerializer(typeof(AssetBase)); 94 XmlSerializer xs = new XmlSerializer(typeof(AssetBase));
95 MemoryStream ms = new MemoryStream(); 95 MemoryStream ms = new MemoryStream();
@@ -136,24 +136,24 @@ namespace OpenSim.Framework.Servers
136 { 136 {
137 string result = String.Empty; 137 string result = String.Empty;
138 138
139 string key = m.Groups[1].Captures[0].Value; 139// string key = m.Groups[1].Captures[0].Value;
140 140//
141 string value = m.Groups[2].Captures[0].Value; 141// string value = m.Groups[2].Captures[0].Value;
142 142//
143 Guid userUri; 143// Guid userUri;
144 144//
145 switch (key) 145// switch (key)
146 { 146// {
147 case "creator_id": 147// case "creator_id":
148 userUri = new Guid(value); 148// userUri = new Guid(value);
149 // result = "creator_url " + userService(userService, userUri); 149// // result = "creator_url " + userService(userService, userUri);
150 break; 150// break;
151 151//
152 case "owner_id": 152// case "owner_id":
153 userUri = new Guid(value); 153// userUri = new Guid(value);
154 // result = "owner_url " + ResolveUserUri(userService, userUri); 154// // result = "owner_url " + ResolveUserUri(userService, userUri);
155 break; 155// break;
156 } 156// }
157 157
158 return result; 158 return result;
159 }); 159 });