diff options
author | Jeff Ames | 2008-05-16 01:22:11 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-16 01:22:11 +0000 |
commit | 65c5efe43b68700bad94076d4cd421160203c5de (patch) | |
tree | 589b56649ed02f4942671fd6e51c6dc43f682e0d /OpenSim/Framework/Communications/Capabilities | |
parent | Thank you very much, mjm for : (diff) | |
download | opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.zip opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.tar.gz opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.tar.bz2 opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Framework/Communications/Capabilities')
10 files changed, 101 insertions, 101 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 705f369..dac2f34 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -64,16 +64,16 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
64 | 64 | ||
65 | public class Caps | 65 | public class Caps |
66 | { | 66 | { |
67 | private static readonly ILog m_log = | 67 | private static readonly ILog m_log = |
68 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 68 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
69 | 69 | ||
70 | private string m_httpListenerHostName; | 70 | private string m_httpListenerHostName; |
71 | private uint m_httpListenPort; | 71 | private uint m_httpListenPort; |
72 | 72 | ||
73 | /// <summary> | 73 | /// <summary> |
74 | /// This is the uuid portion of every CAPS path. It is used to make capability urls private to the requester. | 74 | /// This is the uuid portion of every CAPS path. It is used to make capability urls private to the requester. |
75 | /// </summary> | 75 | /// </summary> |
76 | private string m_capsObjectPath; | 76 | private string m_capsObjectPath; |
77 | public string CapsObjectPath { get { return m_capsObjectPath; } } | 77 | public string CapsObjectPath { get { return m_capsObjectPath; } } |
78 | 78 | ||
79 | private CapsHandlers m_capsHandlers; | 79 | private CapsHandlers m_capsHandlers; |
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
88 | 88 | ||
89 | // The following two entries are in a module, however, there also here so that we don't re-assign | 89 | // The following two entries are in a module, however, there also here so that we don't re-assign |
90 | // the path to another cap by mistake. | 90 | // the path to another cap by mistake. |
91 | private static readonly string m_parcelVoiceInfoRequestPath = "0007/"; // This is in a module. | 91 | private static readonly string m_parcelVoiceInfoRequestPath = "0007/"; // This is in a module. |
92 | private static readonly string m_provisionVoiceAccountRequestPath = "0008/";// This is in a module. | 92 | private static readonly string m_provisionVoiceAccountRequestPath = "0008/";// This is in a module. |
93 | 93 | ||
94 | //private string eventQueue = "0100/"; | 94 | //private string eventQueue = "0100/"; |
@@ -100,7 +100,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
100 | private bool m_dumpAssetsToFile; | 100 | private bool m_dumpAssetsToFile; |
101 | private string m_regionName; | 101 | private string m_regionName; |
102 | 102 | ||
103 | // These are callbacks which will be setup by the scene so that we can update scene data when we | 103 | // These are callbacks which will be setup by the scene so that we can update scene data when we |
104 | // receive capability calls | 104 | // receive capability calls |
105 | public NewInventoryItem AddNewInventoryItem = null; | 105 | public NewInventoryItem AddNewInventoryItem = null; |
106 | public ItemUpdatedCallback ItemUpdatedCall = null; | 106 | public ItemUpdatedCallback ItemUpdatedCall = null; |
@@ -128,46 +128,46 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
128 | public void RegisterHandlers() | 128 | public void RegisterHandlers() |
129 | { | 129 | { |
130 | DeregisterHandlers(); | 130 | DeregisterHandlers(); |
131 | 131 | ||
132 | string capsBase = "/CAPS/" + m_capsObjectPath; | 132 | string capsBase = "/CAPS/" + m_capsObjectPath; |
133 | 133 | ||
134 | try | 134 | try |
135 | { | 135 | { |
136 | // the root of all evil | 136 | // the root of all evil |
137 | m_capsHandlers["SEED"] = new RestStreamHandler("POST", capsBase + m_requestPath, CapsRequest); | 137 | m_capsHandlers["SEED"] = new RestStreamHandler("POST", capsBase + m_requestPath, CapsRequest); |
138 | m_capsHandlers["MapLayer"] = | 138 | m_capsHandlers["MapLayer"] = |
139 | new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", | 139 | new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", |
140 | capsBase + m_mapLayerPath, | 140 | capsBase + m_mapLayerPath, |
141 | GetMapLayer); | 141 | GetMapLayer); |
142 | m_capsHandlers["NewFileAgentInventory"] = | 142 | m_capsHandlers["NewFileAgentInventory"] = |
143 | new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST", | 143 | new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST", |
144 | capsBase + m_newInventory, | 144 | capsBase + m_newInventory, |
145 | NewAgentInventoryRequest); | 145 | NewAgentInventoryRequest); |
146 | m_capsHandlers["UpdateNotecardAgentInventory"] = | 146 | m_capsHandlers["UpdateNotecardAgentInventory"] = |
147 | new RestStreamHandler("POST", capsBase + m_notecardUpdatePath, NoteCardAgentInventory); | 147 | new RestStreamHandler("POST", capsBase + m_notecardUpdatePath, NoteCardAgentInventory); |
148 | m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"]; | 148 | m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"]; |
149 | m_capsHandlers["UpdateScriptTaskInventory"] = | 149 | m_capsHandlers["UpdateScriptTaskInventory"] = |
150 | new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory); | 150 | new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory); |
151 | 151 | ||
152 | // justincc: I've disabled the CAPS service for now to fix problems with selecting textures, and | 152 | // justincc: I've disabled the CAPS service for now to fix problems with selecting textures, and |
153 | // subsequent inventory breakage, in the edit object pane (such as mantis 1085). This requires | 153 | // subsequent inventory breakage, in the edit object pane (such as mantis 1085). This requires |
154 | // enhancements (probably filling out the folder part of the LLSD reply) to our CAPS service, | 154 | // enhancements (probably filling out the folder part of the LLSD reply) to our CAPS service, |
155 | // but when I went on the Linden grid, the | 155 | // but when I went on the Linden grid, the |
156 | // simulators I visited (version 1.21) were, surprisingly, no longer supplying this capability. Instead, | 156 | // simulators I visited (version 1.21) were, surprisingly, no longer supplying this capability. Instead, |
157 | // the 1.19.1.4 client appeared to be happily flowing inventory data over UDP | 157 | // the 1.19.1.4 client appeared to be happily flowing inventory data over UDP |
158 | // | 158 | // |
159 | // This is very probably just a temporary measure - once the CAPS service appears again on the Linden grid | 159 | // This is very probably just a temporary measure - once the CAPS service appears again on the Linden grid |
160 | // we will be | 160 | // we will be |
161 | // able to get the data we need to implement the necessary part of the protocol to fix the issue above. | 161 | // able to get the data we need to implement the necessary part of the protocol to fix the issue above. |
162 | // m_capsHandlers["FetchInventoryDescendents"] = | 162 | // m_capsHandlers["FetchInventoryDescendents"] = |
163 | // new RestStreamHandler("POST", capsBase + m_fetchInventoryPath, FetchInventoryRequest); | 163 | // new RestStreamHandler("POST", capsBase + m_fetchInventoryPath, FetchInventoryRequest); |
164 | 164 | ||
165 | // m_capsHandlers["FetchInventoryDescendents"] = | 165 | // m_capsHandlers["FetchInventoryDescendents"] = |
166 | // new LLSDStreamhandler<LLSDFetchInventoryDescendents, LLSDInventoryDescendents>("POST", | 166 | // new LLSDStreamhandler<LLSDFetchInventoryDescendents, LLSDInventoryDescendents>("POST", |
167 | // capsBase + m_fetchInventory, | 167 | // capsBase + m_fetchInventory, |
168 | // FetchInventory)); | 168 | // FetchInventory)); |
169 | // m_capsHandlers["RequestTextureDownload"] = new RestStreamHandler("POST", | 169 | // m_capsHandlers["RequestTextureDownload"] = new RestStreamHandler("POST", |
170 | // capsBase + m_requestTexture, | 170 | // capsBase + m_requestTexture, |
171 | // RequestTexture); | 171 | // RequestTexture); |
172 | } | 172 | } |
173 | catch (Exception e) | 173 | catch (Exception e) |
@@ -181,7 +181,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
181 | /// </summary> | 181 | /// </summary> |
182 | /// <param name="capName"></param> | 182 | /// <param name="capName"></param> |
183 | /// <param name="handler"></param> | 183 | /// <param name="handler"></param> |
184 | public void RegisterHandler(string capName, IRequestHandler handler) | 184 | public void RegisterHandler(string capName, IRequestHandler handler) |
185 | { | 185 | { |
186 | m_capsHandlers[capName] = handler; | 186 | m_capsHandlers[capName] = handler; |
187 | m_log.DebugFormat("[CAPS]: Registering handler for \"{0}\": path {1}", capName, handler.Path); | 187 | m_log.DebugFormat("[CAPS]: Registering handler for \"{0}\": path {1}", capName, handler.Path); |
@@ -189,14 +189,14 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
189 | 189 | ||
190 | /// <summary> | 190 | /// <summary> |
191 | /// Remove all CAPS service handlers. | 191 | /// Remove all CAPS service handlers. |
192 | /// | 192 | /// |
193 | /// </summary> | 193 | /// </summary> |
194 | /// <param name="httpListener"></param> | 194 | /// <param name="httpListener"></param> |
195 | /// <param name="path"></param> | 195 | /// <param name="path"></param> |
196 | /// <param name="restMethod"></param> | 196 | /// <param name="restMethod"></param> |
197 | public void DeregisterHandlers() | 197 | public void DeregisterHandlers() |
198 | { | 198 | { |
199 | foreach (string capsName in m_capsHandlers.Caps) | 199 | foreach (string capsName in m_capsHandlers.Caps) |
200 | { | 200 | { |
201 | m_capsHandlers.Remove(capsName); | 201 | m_capsHandlers.Remove(capsName); |
202 | } | 202 | } |
@@ -220,7 +220,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
220 | 220 | ||
221 | // FIXME: these all should probably go into the respective region | 221 | // FIXME: these all should probably go into the respective region |
222 | // modules | 222 | // modules |
223 | 223 | ||
224 | /// <summary> | 224 | /// <summary> |
225 | /// Processes a fetch inventory request and sends the reply | 225 | /// Processes a fetch inventory request and sends the reply |
226 | 226 | ||
@@ -229,7 +229,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
229 | /// <param name="path"></param> | 229 | /// <param name="path"></param> |
230 | /// <param name="param"></param> | 230 | /// <param name="param"></param> |
231 | /// <returns></returns> | 231 | /// <returns></returns> |
232 | // Request is like: | 232 | // Request is like: |
233 | //<llsd> | 233 | //<llsd> |
234 | // <map><key>folders</key> | 234 | // <map><key>folders</key> |
235 | // <array> | 235 | // <array> |
@@ -240,14 +240,14 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
240 | // </map> | 240 | // </map> |
241 | //</llsd> | 241 | //</llsd> |
242 | // | 242 | // |
243 | // multiple fetch-folder maps are allowed within the larger folders map. | 243 | // multiple fetch-folder maps are allowed within the larger folders map. |
244 | public string FetchInventoryRequest(string request, string path, string param) | 244 | public string FetchInventoryRequest(string request, string path, string param) |
245 | { | 245 | { |
246 | string unmodifiedRequest = request.ToString(); | 246 | string unmodifiedRequest = request.ToString(); |
247 | 247 | ||
248 | //m_log.DebugFormat("[AGENT INVENTORY]: Received CAPS fetch inventory request {0}", unmodifiedRequest); | 248 | //m_log.DebugFormat("[AGENT INVENTORY]: Received CAPS fetch inventory request {0}", unmodifiedRequest); |
249 | m_log.Debug("[CAPS]: Inventory Request in region: " + m_regionName); | 249 | m_log.Debug("[CAPS]: Inventory Request in region: " + m_regionName); |
250 | 250 | ||
251 | Hashtable hash = new Hashtable(); | 251 | Hashtable hash = new Hashtable(); |
252 | try | 252 | try |
253 | { | 253 | { |
@@ -258,7 +258,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
258 | m_log.Error("[AGENT INVENTORY]: Fetch error: " + pe.Message); | 258 | m_log.Error("[AGENT INVENTORY]: Fetch error: " + pe.Message); |
259 | m_log.Error("Request: " + request.ToString()); | 259 | m_log.Error("Request: " + request.ToString()); |
260 | } | 260 | } |
261 | 261 | ||
262 | ArrayList foldersrequested = (ArrayList)hash["folders"]; | 262 | ArrayList foldersrequested = (ArrayList)hash["folders"]; |
263 | 263 | ||
264 | string response = ""; | 264 | string response = ""; |
@@ -275,15 +275,15 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
275 | inventoryitemstr = LLSDHelpers.SerialiseLLSDReply(reply); | 275 | inventoryitemstr = LLSDHelpers.SerialiseLLSDReply(reply); |
276 | inventoryitemstr = inventoryitemstr.Replace("<llsd><map><key>folders</key><array>", ""); | 276 | inventoryitemstr = inventoryitemstr.Replace("<llsd><map><key>folders</key><array>", ""); |
277 | inventoryitemstr = inventoryitemstr.Replace("</array></map></llsd>", ""); | 277 | inventoryitemstr = inventoryitemstr.Replace("</array></map></llsd>", ""); |
278 | 278 | ||
279 | response += inventoryitemstr; | 279 | response += inventoryitemstr; |
280 | } | 280 | } |
281 | 281 | ||
282 | if (response.Length == 0) | 282 | if (response.Length == 0) |
283 | { | 283 | { |
284 | // Ter-guess: If requests fail a lot, the client seems to stop requesting descendants. | 284 | // Ter-guess: If requests fail a lot, the client seems to stop requesting descendants. |
285 | // Therefore, I'm concluding that the client only has so many threads available to do requests | 285 | // Therefore, I'm concluding that the client only has so many threads available to do requests |
286 | // and when a thread stalls.. is stays stalled. | 286 | // and when a thread stalls.. is stays stalled. |
287 | // Therefore we need to return something valid | 287 | // Therefore we need to return something valid |
288 | response = "<llsd><map><key>folders</key><array /></map></llsd>"; | 288 | response = "<llsd><map><key>folders</key><array /></map></llsd>"; |
289 | } | 289 | } |
@@ -291,7 +291,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
291 | { | 291 | { |
292 | response = "<llsd><map><key>folders</key><array>" + response + "</array></map></llsd>"; | 292 | response = "<llsd><map><key>folders</key><array>" + response + "</array></map></llsd>"; |
293 | } | 293 | } |
294 | 294 | ||
295 | //m_log.DebugFormat("[AGENT INVENTORY]: Replying to CAPS fetch inventory request with following xml"); | 295 | //m_log.DebugFormat("[AGENT INVENTORY]: Replying to CAPS fetch inventory request with following xml"); |
296 | //m_log.Debug(Util.GetFormattedXml(response)); | 296 | //m_log.Debug(Util.GetFormattedXml(response)); |
297 | 297 | ||
@@ -310,7 +310,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
310 | contents.agent___id = m_agentID; | 310 | contents.agent___id = m_agentID; |
311 | contents.owner___id = invFetch.owner_id; | 311 | contents.owner___id = invFetch.owner_id; |
312 | contents.folder___id = invFetch.folder_id; | 312 | contents.folder___id = invFetch.folder_id; |
313 | 313 | ||
314 | // The version number being sent back was originally 1. | 314 | // The version number being sent back was originally 1. |
315 | // Unfortunately, on 1.19.1.4, this means that we see a problem where on subsequent logins | 315 | // Unfortunately, on 1.19.1.4, this means that we see a problem where on subsequent logins |
316 | // without clearing client cache, objects in the root folder disappear until the cache is cleared, | 316 | // without clearing client cache, objects in the root folder disappear until the cache is cleared, |
@@ -318,8 +318,8 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
318 | // | 318 | // |
319 | // Seeing the version to something other than 0 may be the right thing to do, but there is | 319 | // Seeing the version to something other than 0 may be the right thing to do, but there is |
320 | // a greater subtlety of the second life protocol that needs to be understood first. | 320 | // a greater subtlety of the second life protocol that needs to be understood first. |
321 | contents.version = 0; | 321 | contents.version = 0; |
322 | 322 | ||
323 | contents.descendents = 0; | 323 | contents.descendents = 0; |
324 | reply.folders.Array.Add(contents); | 324 | reply.folders.Array.Add(contents); |
325 | List<InventoryItemBase> itemList = null; | 325 | List<InventoryItemBase> itemList = null; |
@@ -327,7 +327,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
327 | { | 327 | { |
328 | itemList = CAPSFetchInventoryDescendents(m_agentID, invFetch.folder_id, invFetch.owner_id, invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order); | 328 | itemList = CAPSFetchInventoryDescendents(m_agentID, invFetch.folder_id, invFetch.owner_id, invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order); |
329 | } | 329 | } |
330 | 330 | ||
331 | if (itemList != null) | 331 | if (itemList != null) |
332 | { | 332 | { |
333 | foreach (InventoryItemBase invItem in itemList) | 333 | foreach (InventoryItemBase invItem in itemList) |
@@ -336,12 +336,12 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
336 | } | 336 | } |
337 | } | 337 | } |
338 | else | 338 | else |
339 | { | 339 | { |
340 | IClientAPI client = GetClient(m_agentID); | 340 | IClientAPI client = GetClient(m_agentID); |
341 | 341 | ||
342 | // We're going to both notify the client of inventory service failure and send back a 'no folder contents' response. | 342 | // We're going to both notify the client of inventory service failure and send back a 'no folder contents' response. |
343 | // If we don't send back the response, | 343 | // If we don't send back the response, |
344 | // the client becomes unhappy (see Teravus' comment in FetchInventoryRequest()) | 344 | // the client becomes unhappy (see Teravus' comment in FetchInventoryRequest()) |
345 | if (client != null) | 345 | if (client != null) |
346 | { | 346 | { |
347 | client.SendAgentAlertMessage( | 347 | client.SendAgentAlertMessage( |
@@ -351,11 +351,11 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
351 | else | 351 | else |
352 | { | 352 | { |
353 | m_log.ErrorFormat( | 353 | m_log.ErrorFormat( |
354 | "[AGENT INVENTORY]: Could not lookup controlling client for {0} in order to notify them of the inventory service failure", | 354 | "[AGENT INVENTORY]: Could not lookup controlling client for {0} in order to notify them of the inventory service failure", |
355 | m_agentID); | 355 | m_agentID); |
356 | } | 356 | } |
357 | } | 357 | } |
358 | 358 | ||
359 | contents.descendents = contents.items.Array.Count; | 359 | contents.descendents = contents.items.Array.Count; |
360 | return reply; | 360 | return reply; |
361 | } | 361 | } |
@@ -375,7 +375,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
375 | llsdItem.item_id = invItem.ID; | 375 | llsdItem.item_id = invItem.ID; |
376 | llsdItem.name = invItem.Name; | 376 | llsdItem.name = invItem.Name; |
377 | llsdItem.parent_id = invItem.Folder; | 377 | llsdItem.parent_id = invItem.Folder; |
378 | llsdItem.type = Enum.GetName(typeof(AssetType), invItem.AssetType).ToLower(); | 378 | llsdItem.type = Enum.GetName(typeof(AssetType), invItem.AssetType).ToLower(); |
379 | llsdItem.inv_type = Enum.GetName(typeof(InventoryType), invItem.InvType).ToLower(); | 379 | llsdItem.inv_type = Enum.GetName(typeof(InventoryType), invItem.InvType).ToLower(); |
380 | llsdItem.permissions = new LLSDPermissions(); | 380 | llsdItem.permissions = new LLSDPermissions(); |
381 | llsdItem.permissions.creator_id = invItem.Creator; | 381 | llsdItem.permissions.creator_id = invItem.Creator; |
@@ -395,7 +395,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
395 | } | 395 | } |
396 | 396 | ||
397 | /// <summary> | 397 | /// <summary> |
398 | /// | 398 | /// |
399 | /// </summary> | 399 | /// </summary> |
400 | /// <param name="mapReq"></param> | 400 | /// <param name="mapReq"></param> |
401 | /// <returns></returns> | 401 | /// <returns></returns> |
@@ -408,7 +408,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
408 | } | 408 | } |
409 | 409 | ||
410 | /// <summary> | 410 | /// <summary> |
411 | /// | 411 | /// |
412 | /// </summary> | 412 | /// </summary> |
413 | /// <returns></returns> | 413 | /// <returns></returns> |
414 | protected static LLSDMapLayer GetLLSDMapLayerResponse() | 414 | protected static LLSDMapLayer GetLLSDMapLayerResponse() |
@@ -421,7 +421,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
421 | } | 421 | } |
422 | 422 | ||
423 | /// <summary> | 423 | /// <summary> |
424 | /// | 424 | /// |
425 | /// </summary> | 425 | /// </summary> |
426 | /// <param name="request"></param> | 426 | /// <param name="request"></param> |
427 | /// <param name="path"></param> | 427 | /// <param name="path"></param> |
@@ -437,7 +437,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
437 | #region EventQueue (Currently not enabled) | 437 | #region EventQueue (Currently not enabled) |
438 | 438 | ||
439 | /// <summary> | 439 | /// <summary> |
440 | /// | 440 | /// |
441 | /// </summary> | 441 | /// </summary> |
442 | /// <param name="request"></param> | 442 | /// <param name="request"></param> |
443 | /// <param name="path"></param> | 443 | /// <param name="path"></param> |
@@ -463,7 +463,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
463 | } | 463 | } |
464 | 464 | ||
465 | /// <summary> | 465 | /// <summary> |
466 | /// | 466 | /// |
467 | /// </summary> | 467 | /// </summary> |
468 | /// <param name="caps"></param> | 468 | /// <param name="caps"></param> |
469 | /// <param name="ipAddressPort"></param> | 469 | /// <param name="ipAddressPort"></param> |
@@ -482,7 +482,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
482 | } | 482 | } |
483 | 483 | ||
484 | /// <summary> | 484 | /// <summary> |
485 | /// | 485 | /// |
486 | /// </summary> | 486 | /// </summary> |
487 | /// <returns></returns> | 487 | /// <returns></returns> |
488 | public string CreateEmptyEventResponse() | 488 | public string CreateEmptyEventResponse() |
@@ -590,7 +590,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
590 | } | 590 | } |
591 | 591 | ||
592 | /// <summary> | 592 | /// <summary> |
593 | /// | 593 | /// |
594 | /// </summary> | 594 | /// </summary> |
595 | /// <param name="llsdRequest"></param> | 595 | /// <param name="llsdRequest"></param> |
596 | /// <returns></returns> | 596 | /// <returns></returns> |
@@ -622,7 +622,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
622 | } | 622 | } |
623 | 623 | ||
624 | /// <summary> | 624 | /// <summary> |
625 | /// | 625 | /// |
626 | /// </summary> | 626 | /// </summary> |
627 | /// <param name="assetID"></param> | 627 | /// <param name="assetID"></param> |
628 | /// <param name="inventoryItem"></param> | 628 | /// <param name="inventoryItem"></param> |
@@ -708,7 +708,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
708 | /// <param name="itemID">Item to update</param> | 708 | /// <param name="itemID">Item to update</param> |
709 | /// <param name="primID">Prim containing item to update</param> | 709 | /// <param name="primID">Prim containing item to update</param> |
710 | /// <param name="isScriptRunning">Signals whether the script to update is currently running</param> | 710 | /// <param name="isScriptRunning">Signals whether the script to update is currently running</param> |
711 | /// <param name="data">New asset data</param> | 711 | /// <param name="data">New asset data</param> |
712 | public void TaskScriptUpdated(LLUUID itemID, LLUUID primID, bool isScriptRunning, byte[] data) | 712 | public void TaskScriptUpdated(LLUUID itemID, LLUUID primID, bool isScriptRunning, byte[] data) |
713 | { | 713 | { |
714 | if (TaskScriptUpdatedCall != null) | 714 | if (TaskScriptUpdatedCall != null) |
@@ -751,7 +751,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
751 | } | 751 | } |
752 | 752 | ||
753 | /// <summary> | 753 | /// <summary> |
754 | /// | 754 | /// |
755 | /// </summary> | 755 | /// </summary> |
756 | /// <param name="data"></param> | 756 | /// <param name="data"></param> |
757 | /// <param name="path"></param> | 757 | /// <param name="path"></param> |
@@ -807,7 +807,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
807 | } | 807 | } |
808 | 808 | ||
809 | /// <summary> | 809 | /// <summary> |
810 | /// This class is a callback invoked when a client sends asset data to | 810 | /// This class is a callback invoked when a client sends asset data to |
811 | /// an agent inventory notecard update url | 811 | /// an agent inventory notecard update url |
812 | /// </summary> | 812 | /// </summary> |
813 | public class ItemUpdater | 813 | public class ItemUpdater |
@@ -831,7 +831,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
831 | } | 831 | } |
832 | 832 | ||
833 | /// <summary> | 833 | /// <summary> |
834 | /// | 834 | /// |
835 | /// </summary> | 835 | /// </summary> |
836 | /// <param name="data"></param> | 836 | /// <param name="data"></param> |
837 | /// <param name="path"></param> | 837 | /// <param name="path"></param> |
@@ -889,7 +889,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
889 | } | 889 | } |
890 | 890 | ||
891 | /// <summary> | 891 | /// <summary> |
892 | /// This class is a callback invoked when a client sends asset data to | 892 | /// This class is a callback invoked when a client sends asset data to |
893 | /// a task inventory script update url | 893 | /// a task inventory script update url |
894 | /// </summary> | 894 | /// </summary> |
895 | public class TaskInventoryScriptUpdater | 895 | public class TaskInventoryScriptUpdater |
@@ -921,7 +921,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
921 | } | 921 | } |
922 | 922 | ||
923 | /// <summary> | 923 | /// <summary> |
924 | /// | 924 | /// |
925 | /// </summary> | 925 | /// </summary> |
926 | /// <param name="data"></param> | 926 | /// <param name="data"></param> |
927 | /// <param name="path"></param> | 927 | /// <param name="path"></param> |
@@ -931,7 +931,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
931 | { | 931 | { |
932 | try | 932 | try |
933 | { | 933 | { |
934 | // m_log.InfoFormat("[CAPS]: " + | 934 | // m_log.InfoFormat("[CAPS]: " + |
935 | // "TaskInventoryScriptUpdater received data: {0}, path: {1}, param: {2}", | 935 | // "TaskInventoryScriptUpdater received data: {0}, path: {1}, param: {2}", |
936 | // data, path, param)); | 936 | // data, path, param)); |
937 | 937 | ||
diff --git a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs index e76a5c5..4a3d00f 100644 --- a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs +++ b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs | |||
@@ -64,14 +64,14 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
64 | /// </summary> | 64 | /// </summary> |
65 | /// <param name="capsName">name of the capability of the cap | 65 | /// <param name="capsName">name of the capability of the cap |
66 | /// handler to be removed</param> | 66 | /// handler to be removed</param> |
67 | public void Remove(string capsName) | 67 | public void Remove(string capsName) |
68 | { | 68 | { |
69 | // This line must be here, or caps will break! | 69 | // This line must be here, or caps will break! |
70 | m_httpListener.RemoveStreamHandler("POST", m_capsHandlers[capsName].Path); | 70 | m_httpListener.RemoveStreamHandler("POST", m_capsHandlers[capsName].Path); |
71 | m_capsHandlers.Remove(capsName); | 71 | m_capsHandlers.Remove(capsName); |
72 | } | 72 | } |
73 | 73 | ||
74 | public bool ContainsCap(string cap) | 74 | public bool ContainsCap(string cap) |
75 | { | 75 | { |
76 | return m_capsHandlers.ContainsKey(cap); | 76 | return m_capsHandlers.ContainsKey(cap); |
77 | } | 77 | } |
@@ -85,14 +85,14 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
85 | /// retrieve a cap handler for a cap that is not contained in | 85 | /// retrieve a cap handler for a cap that is not contained in |
86 | /// CapsHandlers. | 86 | /// CapsHandlers. |
87 | /// </Remarks> | 87 | /// </Remarks> |
88 | public IRequestHandler this[string idx] | 88 | public IRequestHandler this[string idx] |
89 | { | 89 | { |
90 | get | 90 | get |
91 | { | 91 | { |
92 | return m_capsHandlers[idx]; | 92 | return m_capsHandlers[idx]; |
93 | } | 93 | } |
94 | 94 | ||
95 | set | 95 | set |
96 | { | 96 | { |
97 | if (m_capsHandlers.ContainsKey(idx)) | 97 | if (m_capsHandlers.ContainsKey(idx)) |
98 | { | 98 | { |
@@ -111,9 +111,9 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
111 | /// Return the list of cap names for which this CapsHandlers | 111 | /// Return the list of cap names for which this CapsHandlers |
112 | /// object contains cap handlers. | 112 | /// object contains cap handlers. |
113 | /// </summary> | 113 | /// </summary> |
114 | public string[] Caps | 114 | public string[] Caps |
115 | { | 115 | { |
116 | get | 116 | get |
117 | { | 117 | { |
118 | string[] __keys = new string[m_capsHandlers.Keys.Count]; | 118 | string[] __keys = new string[m_capsHandlers.Keys.Count]; |
119 | m_capsHandlers.Keys.CopyTo(__keys, 0); | 119 | m_capsHandlers.Keys.CopyTo(__keys, 0); |
@@ -125,7 +125,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
125 | /// Return an LLSD-serializable Hashtable describing the | 125 | /// Return an LLSD-serializable Hashtable describing the |
126 | /// capabilities and their handler details. | 126 | /// capabilities and their handler details. |
127 | /// </summary> | 127 | /// </summary> |
128 | public Hashtable CapsDetails | 128 | public Hashtable CapsDetails |
129 | { | 129 | { |
130 | get | 130 | get |
131 | { | 131 | { |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSD.cs b/OpenSim/Framework/Communications/Capabilities/LLSD.cs index e869267..bcf7a88 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSD.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSD.cs | |||
@@ -37,12 +37,12 @@ using libsecondlife; | |||
37 | namespace OpenSim.Framework.Communications.Capabilities | 37 | namespace OpenSim.Framework.Communications.Capabilities |
38 | { | 38 | { |
39 | /// <summary> | 39 | /// <summary> |
40 | /// Borrowed from (a older version of) libsl for now, as their new llsd code doesn't work we our decoding code. | 40 | /// Borrowed from (a older version of) libsl for now, as their new llsd code doesn't work we our decoding code. |
41 | /// </summary> | 41 | /// </summary> |
42 | public static class LLSD | 42 | public static class LLSD |
43 | { | 43 | { |
44 | /// <summary> | 44 | /// <summary> |
45 | /// | 45 | /// |
46 | /// </summary> | 46 | /// </summary> |
47 | public class LLSDParseException : Exception | 47 | public class LLSDParseException : Exception |
48 | { | 48 | { |
@@ -52,7 +52,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
52 | } | 52 | } |
53 | 53 | ||
54 | /// <summary> | 54 | /// <summary> |
55 | /// | 55 | /// |
56 | /// </summary> | 56 | /// </summary> |
57 | public class LLSDSerializeException : Exception | 57 | public class LLSDSerializeException : Exception |
58 | { | 58 | { |
@@ -62,7 +62,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
62 | } | 62 | } |
63 | 63 | ||
64 | /// <summary> | 64 | /// <summary> |
65 | /// | 65 | /// |
66 | /// </summary> | 66 | /// </summary> |
67 | /// <param name="b"></param> | 67 | /// <param name="b"></param> |
68 | /// <returns></returns> | 68 | /// <returns></returns> |
@@ -72,7 +72,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
72 | } | 72 | } |
73 | 73 | ||
74 | /// <summary> | 74 | /// <summary> |
75 | /// | 75 | /// |
76 | /// </summary> | 76 | /// </summary> |
77 | /// <param name="st"></param> | 77 | /// <param name="st"></param> |
78 | /// <returns></returns> | 78 | /// <returns></returns> |
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
96 | } | 96 | } |
97 | 97 | ||
98 | /// <summary> | 98 | /// <summary> |
99 | /// | 99 | /// |
100 | /// </summary> | 100 | /// </summary> |
101 | /// <param name="obj"></param> | 101 | /// <param name="obj"></param> |
102 | /// <returns></returns> | 102 | /// <returns></returns> |
@@ -116,7 +116,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
116 | } | 116 | } |
117 | 117 | ||
118 | /// <summary> | 118 | /// <summary> |
119 | /// | 119 | /// |
120 | /// </summary> | 120 | /// </summary> |
121 | /// <param name="writer"></param> | 121 | /// <param name="writer"></param> |
122 | /// <param name="obj"></param> | 122 | /// <param name="obj"></param> |
@@ -217,7 +217,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
217 | } | 217 | } |
218 | 218 | ||
219 | /// <summary> | 219 | /// <summary> |
220 | /// | 220 | /// |
221 | /// </summary> | 221 | /// </summary> |
222 | /// <param name="reader"></param> | 222 | /// <param name="reader"></param> |
223 | /// <returns></returns> | 223 | /// <returns></returns> |
@@ -360,7 +360,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
360 | } | 360 | } |
361 | 361 | ||
362 | /// <summary> | 362 | /// <summary> |
363 | /// | 363 | /// |
364 | /// </summary> | 364 | /// </summary> |
365 | /// <param name="reader"></param> | 365 | /// <param name="reader"></param> |
366 | /// <returns></returns> | 366 | /// <returns></returns> |
@@ -405,7 +405,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
405 | } | 405 | } |
406 | 406 | ||
407 | /// <summary> | 407 | /// <summary> |
408 | /// | 408 | /// |
409 | /// </summary> | 409 | /// </summary> |
410 | /// <param name="reader"></param> | 410 | /// <param name="reader"></param> |
411 | /// <returns></returns> | 411 | /// <returns></returns> |
@@ -441,7 +441,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
441 | } | 441 | } |
442 | 442 | ||
443 | /// <summary> | 443 | /// <summary> |
444 | /// | 444 | /// |
445 | /// </summary> | 445 | /// </summary> |
446 | /// <param name="count"></param> | 446 | /// <param name="count"></param> |
447 | /// <returns></returns> | 447 | /// <returns></returns> |
@@ -453,7 +453,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
453 | } | 453 | } |
454 | 454 | ||
455 | /// <summary> | 455 | /// <summary> |
456 | /// | 456 | /// |
457 | /// </summary> | 457 | /// </summary> |
458 | /// <param name="obj"></param> | 458 | /// <param name="obj"></param> |
459 | /// <param name="indent"></param> | 459 | /// <param name="indent"></param> |
@@ -661,7 +661,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
661 | } | 661 | } |
662 | 662 | ||
663 | /// <summary> | 663 | /// <summary> |
664 | /// | 664 | /// |
665 | /// </summary> | 665 | /// </summary> |
666 | /// <param name="reader"></param> | 666 | /// <param name="reader"></param> |
667 | private static void SkipWS(XmlTextReader reader) | 667 | private static void SkipWS(XmlTextReader reader) |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs index 409d2e0..507f12b 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs | |||
@@ -35,9 +35,9 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
35 | { | 35 | { |
36 | public class LLSDHelpers | 36 | public class LLSDHelpers |
37 | { | 37 | { |
38 | // private static readonly log4net.ILog m_log | 38 | // private static readonly log4net.ILog m_log |
39 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 39 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
40 | 40 | ||
41 | public static string SerialiseLLSDReply(object obj) | 41 | public static string SerialiseLLSDReply(object obj) |
42 | { | 42 | { |
43 | StringWriter sw = new StringWriter(); | 43 | StringWriter sw = new StringWriter(); |
@@ -47,9 +47,9 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
47 | SerializeLLSDType(writer, obj); | 47 | SerializeLLSDType(writer, obj); |
48 | writer.WriteEndElement(); | 48 | writer.WriteEndElement(); |
49 | writer.Close(); | 49 | writer.Close(); |
50 | 50 | ||
51 | //m_log.DebugFormat("[LLSD Helpers]: Generated serialized LLSD reply {0}", sw.ToString()); | 51 | //m_log.DebugFormat("[LLSD Helpers]: Generated serialized LLSD reply {0}", sw.ToString()); |
52 | 52 | ||
53 | return sw.ToString(); | 53 | return sw.ToString(); |
54 | } | 54 | } |
55 | 55 | ||
@@ -146,7 +146,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
146 | fieldValue.GetType().GetField("Array").SetValue(fieldValue, enumerator.Value); | 146 | fieldValue.GetType().GetField("Array").SetValue(fieldValue, enumerator.Value); |
147 | //TODO | 147 | //TODO |
148 | // the LLSD map/array types in the array need to be deserialised | 148 | // the LLSD map/array types in the array need to be deserialised |
149 | // but first we need to know the right class to deserialise them into. | 149 | // but first we need to know the right class to deserialise them into. |
150 | } | 150 | } |
151 | else | 151 | else |
152 | { | 152 | { |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs index 31896c2..1a75aba 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs | |||
@@ -91,7 +91,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
91 | public int descendents; | 91 | public int descendents; |
92 | public LLUUID folder___id; //as LL can't decide if they are going to use "_" or "-" to separate words in the field names | 92 | public LLUUID folder___id; //as LL can't decide if they are going to use "_" or "-" to separate words in the field names |
93 | public LLSDArray items = new LLSDArray(); | 93 | public LLSDArray items = new LLSDArray(); |
94 | public LLUUID owner___id; // and of course we can't have field names with "-" in | 94 | public LLUUID owner___id; // and of course we can't have field names with "-" in |
95 | public int version; | 95 | public int version; |
96 | } | 96 | } |
97 | } \ No newline at end of file | 97 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs index fb5eaa8..c045dcf 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs | |||
@@ -23,7 +23,7 @@ | |||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | 28 | ||
29 | using System.Collections; | 29 | using System.Collections; |
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
41 | { | 41 | { |
42 | } | 42 | } |
43 | 43 | ||
44 | public LLSDParcelVoiceInfoResponse(string region, int localID, Hashtable creds) | 44 | public LLSDParcelVoiceInfoResponse(string region, int localID, Hashtable creds) |
45 | { | 45 | { |
46 | region_name = region; | 46 | region_name = region; |
47 | parcel_local_id = localID; | 47 | parcel_local_id = localID; |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs index 5e8a08f..8683cea 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
51 | //string requestBody = streamReader.ReadToEnd(); | 51 | //string requestBody = streamReader.ReadToEnd(); |
52 | //streamReader.Close(); | 52 | //streamReader.Close(); |
53 | 53 | ||
54 | // libsecondlife.StructuredData.LLSDMap hash = (libsecondlife.StructuredData.LLSDMap) | 54 | // libsecondlife.StructuredData.LLSDMap hash = (libsecondlife.StructuredData.LLSDMap) |
55 | // libsecondlife.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request)); | 55 | // libsecondlife.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request)); |
56 | 56 | ||
57 | Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(request); | 57 | Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(request); |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs index ee9ff1b..8bfd20c 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDTaskInventoryUploadComplete.cs | |||
@@ -34,7 +34,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
34 | { | 34 | { |
35 | /// <summary> | 35 | /// <summary> |
36 | /// The task inventory item that was updated | 36 | /// The task inventory item that was updated |
37 | /// </summary> | 37 | /// </summary> |
38 | public LLUUID item_id; | 38 | public LLUUID item_id; |
39 | 39 | ||
40 | /// <summary> | 40 | /// <summary> |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs index df32d1a..e45d9de 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs | |||
@@ -34,17 +34,17 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
34 | { | 34 | { |
35 | /// <summary> | 35 | /// <summary> |
36 | /// The item containing the script to update | 36 | /// The item containing the script to update |
37 | /// </summary> | 37 | /// </summary> |
38 | public LLUUID item_id; | 38 | public LLUUID item_id; |
39 | 39 | ||
40 | /// <summary> | 40 | /// <summary> |
41 | /// The task containing the script | 41 | /// The task containing the script |
42 | /// </summary> | 42 | /// </summary> |
43 | public LLUUID task_id; | 43 | public LLUUID task_id; |
44 | 44 | ||
45 | /// <summary> | 45 | /// <summary> |
46 | /// Signals whether the script is currently active | 46 | /// Signals whether the script is currently active |
47 | /// </summary> | 47 | /// </summary> |
48 | public int is_script_running; | 48 | public int is_script_running; |
49 | } | 49 | } |
50 | } \ No newline at end of file | 50 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs index 67064b0..8143233 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs | |||
@@ -23,7 +23,7 @@ | |||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | 28 | ||
29 | namespace OpenSim.Framework.Communications.Capabilities | 29 | namespace OpenSim.Framework.Communications.Capabilities |
@@ -38,7 +38,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
38 | { | 38 | { |
39 | } | 39 | } |
40 | 40 | ||
41 | public LLSDVoiceAccountResponse(string user, string pass) | 41 | public LLSDVoiceAccountResponse(string user, string pass) |
42 | { | 42 | { |
43 | username = user; | 43 | username = user; |
44 | password = pass; | 44 | password = pass; |