aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Capabilities
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Capabilities')
-rw-r--r--OpenSim/Region/Capabilities/Caps.cs52
1 files changed, 42 insertions, 10 deletions
diff --git a/OpenSim/Region/Capabilities/Caps.cs b/OpenSim/Region/Capabilities/Caps.cs
index 70d601f..6206f65 100644
--- a/OpenSim/Region/Capabilities/Caps.cs
+++ b/OpenSim/Region/Capabilities/Caps.cs
@@ -73,6 +73,7 @@ namespace OpenSim.Region.Capabilities
73 Console.WriteLine("registering CAPS handlers"); 73 Console.WriteLine("registering CAPS handlers");
74 string capsBase = "/CAPS/" + m_capsObjectPath; 74 string capsBase = "/CAPS/" + m_capsObjectPath;
75 75
76
76 AddLegacyCapsHandler( httpListener, m_mapLayerPath, MapLayer); 77 AddLegacyCapsHandler( httpListener, m_mapLayerPath, MapLayer);
77 78
78 //httpListener.AddStreamHandler( 79 //httpListener.AddStreamHandler(
@@ -82,6 +83,7 @@ namespace OpenSim.Region.Capabilities
82 AddLegacyCapsHandler(httpListener, m_newInventory, NewAgentInventory); 83 AddLegacyCapsHandler(httpListener, m_newInventory, NewAgentInventory);
83 AddLegacyCapsHandler( httpListener, eventQueue, ProcessEventQueue); 84 AddLegacyCapsHandler( httpListener, eventQueue, ProcessEventQueue);
84 AddLegacyCapsHandler( httpListener, m_requestTexture, RequestTexture); 85 AddLegacyCapsHandler( httpListener, m_requestTexture, RequestTexture);
86
85 } 87 }
86 88
87 public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq) 89 public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq)
@@ -153,6 +155,20 @@ namespace OpenSim.Region.Capabilities
153 /// <summary> 155 /// <summary>
154 /// 156 ///
155 /// </summary> 157 /// </summary>
158 /// <returns></returns>
159 protected LLSDMapLayer BuildLLSDMapLayerResponse()
160 {
161 LLSDMapLayer mapLayer = new LLSDMapLayer();
162 mapLayer.Right = 5000;
163 mapLayer.Top = 5000;
164 mapLayer.ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
165
166 return mapLayer;
167 }
168
169 /// <summary>
170 ///
171 /// </summary>
156 /// <param name="request"></param> 172 /// <param name="request"></param>
157 /// <param name="path"></param> 173 /// <param name="path"></param>
158 /// <param name="param"></param> 174 /// <param name="param"></param>
@@ -166,17 +182,10 @@ namespace OpenSim.Region.Capabilities
166 /// <summary> 182 /// <summary>
167 /// 183 ///
168 /// </summary> 184 /// </summary>
185 /// <param name="request"></param>
186 /// <param name="path"></param>
187 /// <param name="param"></param>
169 /// <returns></returns> 188 /// <returns></returns>
170 protected LLSDMapLayer BuildLLSDMapLayerResponse()
171 {
172 LLSDMapLayer mapLayer = new LLSDMapLayer();
173 mapLayer.Right = 5000;
174 mapLayer.Top = 5000;
175 mapLayer.ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
176
177 return mapLayer;
178 }
179
180 public string ProcessEventQueue(string request, string path, string param) 189 public string ProcessEventQueue(string request, string path, string param)
181 { 190 {
182 string res = ""; 191 string res = "";
@@ -196,6 +205,12 @@ namespace OpenSim.Region.Capabilities
196 return res; 205 return res;
197 } 206 }
198 207
208 /// <summary>
209 ///
210 /// </summary>
211 /// <param name="caps"></param>
212 /// <param name="ipAddressPort"></param>
213 /// <returns></returns>
199 public string CreateEstablishAgentComms(string caps, string ipAddressPort) 214 public string CreateEstablishAgentComms(string caps, string ipAddressPort)
200 { 215 {
201 LLSDCapEvent eventItem = new LLSDCapEvent(); 216 LLSDCapEvent eventItem = new LLSDCapEvent();
@@ -209,6 +224,10 @@ namespace OpenSim.Region.Capabilities
209 return res; 224 return res;
210 } 225 }
211 226
227 /// <summary>
228 ///
229 /// </summary>
230 /// <returns></returns>
212 public string CreateEmptyEventResponse() 231 public string CreateEmptyEventResponse()
213 { 232 {
214 LLSDCapEvent eventItem = new LLSDCapEvent(); 233 LLSDCapEvent eventItem = new LLSDCapEvent();
@@ -219,6 +238,13 @@ namespace OpenSim.Region.Capabilities
219 return res; 238 return res;
220 } 239 }
221 240
241 /// <summary>
242 ///
243 /// </summary>
244 /// <param name="request"></param>
245 /// <param name="path"></param>
246 /// <param name="param"></param>
247 /// <returns></returns>
222 public string NewAgentInventory(string request, string path, string param) 248 public string NewAgentInventory(string request, string path, string param)
223 { 249 {
224 //Console.WriteLine("received upload request:"+ request); 250 //Console.WriteLine("received upload request:"+ request);
@@ -241,6 +267,12 @@ namespace OpenSim.Region.Capabilities
241 return res; 267 return res;
242 } 268 }
243 269
270 /// <summary>
271 ///
272 /// </summary>
273 /// <param name="assetID"></param>
274 /// <param name="inventoryItem"></param>
275 /// <param name="data"></param>
244 public void UploadHandler(LLUUID assetID, LLUUID inventoryItem, byte[] data) 276 public void UploadHandler(LLUUID assetID, LLUUID inventoryItem, byte[] data)
245 { 277 {
246 // Console.WriteLine("upload handler called"); 278 // Console.WriteLine("upload handler called");