aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
authorTeravus Ovares2008-04-17 19:42:54 +0000
committerTeravus Ovares2008-04-17 19:42:54 +0000
commitdd4deebbcbe07cccf8ce700c29c9884f1f414c85 (patch)
treee5df5e61c84e800d5d38db3b72209d1bc2764959 /OpenSim/Framework/Communications
parent* Acks the first UseCircuitCode packet (diff)
downloadopensim-SC_OLD-dd4deebbcbe07cccf8ce700c29c9884f1f414c85.zip
opensim-SC_OLD-dd4deebbcbe07cccf8ce700c29c9884f1f414c85.tar.gz
opensim-SC_OLD-dd4deebbcbe07cccf8ce700c29c9884f1f414c85.tar.bz2
opensim-SC_OLD-dd4deebbcbe07cccf8ce700c29c9884f1f414c85.tar.xz
* Re-Fixed caps
* This fixes chi11ken's/OpenViewer's libsl cap issue.
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs13
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs9
-rw-r--r--OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs2
3 files changed, 10 insertions, 14 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 9f202ff..ec5717e 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -251,11 +251,6 @@ namespace OpenSim.Framework.Communications.Cache
251 ItemReceive(userID, itemInfo); 251 ItemReceive(userID, itemInfo);
252 m_commsManager.InventoryService.AddNewInventoryItem(userID, itemInfo); 252 m_commsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
253 } 253 }
254 else
255 {
256 m_log.Error("[UNABLE TO UPLOAD]: ");
257 }
258
259 } 254 }
260 255
261 /// <summary> 256 /// <summary>
@@ -269,10 +264,6 @@ namespace OpenSim.Framework.Communications.Cache
269 { 264 {
270 m_commsManager.InventoryService.AddNewInventoryItem(userID, itemInfo); 265 m_commsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
271 } 266 }
272 else
273 {
274 m_log.Error("[UNABLE TO UPDATE]: ");
275 }
276 } 267 }
277 268
278 /// <summary> 269 /// <summary>
@@ -292,10 +283,6 @@ namespace OpenSim.Framework.Communications.Cache
292 m_commsManager.InventoryService.DeleteInventoryItem(userID, item); 283 m_commsManager.InventoryService.DeleteInventoryItem(userID, item);
293 } 284 }
294 } 285 }
295 else
296 {
297 m_log.Error("[UNABLE TO DELETE]: ");
298 }
299 286
300 return result; 287 return result;
301 } 288 }
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index a65a3f1..2eff9c2 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -100,6 +100,7 @@ namespace OpenSim.Region.Capabilities
100 private int m_eventQueueCount = 1; 100 private int m_eventQueueCount = 1;
101 private Queue<string> m_capsEventQueue = new Queue<string>(); 101 private Queue<string> m_capsEventQueue = new Queue<string>();
102 private bool m_dumpAssetsToFile; 102 private bool m_dumpAssetsToFile;
103 private string m_regionName;
103 104
104 // These are callbacks which will be setup by the scene so that we can update scene data when we 105 // These are callbacks which will be setup by the scene so that we can update scene data when we
105 // receive capability calls 106 // receive capability calls
@@ -110,7 +111,7 @@ namespace OpenSim.Region.Capabilities
110 public GetClientDelegate GetClient = null; 111 public GetClientDelegate GetClient = null;
111 112
112 public Caps(AssetCache assetCache, BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath, 113 public Caps(AssetCache assetCache, BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath,
113 LLUUID agent, bool dumpAssetsToFile) 114 LLUUID agent, bool dumpAssetsToFile, string regionName)
114 { 115 {
115 m_assetCache = assetCache; 116 m_assetCache = assetCache;
116 m_capsObjectPath = capsPath; 117 m_capsObjectPath = capsPath;
@@ -120,6 +121,7 @@ namespace OpenSim.Region.Capabilities
120 m_agentID = agent; 121 m_agentID = agent;
121 m_dumpAssetsToFile = dumpAssetsToFile; 122 m_dumpAssetsToFile = dumpAssetsToFile;
122 m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort); 123 m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort);
124 m_regionName = regionName;
123 } 125 }
124 126
125 /// <summary> 127 /// <summary>
@@ -199,6 +201,7 @@ namespace OpenSim.Region.Capabilities
199 /// <returns></returns> 201 /// <returns></returns>
200 public string CapsRequest(string request, string path, string param) 202 public string CapsRequest(string request, string path, string param)
201 { 203 {
204 m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName);
202 //Console.WriteLine("caps request " + request); 205 //Console.WriteLine("caps request " + request);
203 string result = LLSDHelpers.SerialiseLLSDReply(m_capsHandlers.CapsDetails); 206 string result = LLSDHelpers.SerialiseLLSDReply(m_capsHandlers.CapsDetails);
204 //m_log.DebugFormat("[CAPS] CapsRequest {0}", result); 207 //m_log.DebugFormat("[CAPS] CapsRequest {0}", result);
@@ -225,6 +228,7 @@ namespace OpenSim.Region.Capabilities
225 string unmodifiedRequest = request.ToString(); 228 string unmodifiedRequest = request.ToString();
226 229
227 //m_log.DebugFormat("[AGENT INVENTORY]: Received CAPS fetch inventory request {0}", unmodifiedRequest); 230 //m_log.DebugFormat("[AGENT INVENTORY]: Received CAPS fetch inventory request {0}", unmodifiedRequest);
231 m_log.Debug("[CAPS]: Inventory Request in region: " + m_regionName);
228 232
229 Hashtable hash = new Hashtable(); 233 Hashtable hash = new Hashtable();
230 try 234 try
@@ -366,6 +370,7 @@ namespace OpenSim.Region.Capabilities
366 /// <returns></returns> 370 /// <returns></returns>
367 public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq) 371 public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq)
368 { 372 {
373 m_log.Debug("[CAPS]: MapLayer Request in region: " + m_regionName);
369 LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse(); 374 LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();
370 mapResponse.LayerData.Array.Add(GetLLSDMapLayerResponse()); 375 mapResponse.LayerData.Array.Add(GetLLSDMapLayerResponse());
371 return mapResponse; 376 return mapResponse;
@@ -472,6 +477,7 @@ namespace OpenSim.Region.Capabilities
472 { 477 {
473 try 478 try
474 { 479 {
480 m_log.Debug("[CAPS]: ScriptTaskInventory Request in region: " + m_regionName);
475 //m_log.DebugFormat("[CAPS]: request: {0}, path: {1}, param: {2}", request, path, param); 481 //m_log.DebugFormat("[CAPS]: request: {0}, path: {1}, param: {2}", request, path, param);
476 482
477 Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Helpers.StringToField(request)); 483 Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Helpers.StringToField(request));
@@ -523,6 +529,7 @@ namespace OpenSim.Region.Capabilities
523 /// <returns></returns> 529 /// <returns></returns>
524 public string NoteCardAgentInventory(string request, string path, string param) 530 public string NoteCardAgentInventory(string request, string path, string param)
525 { 531 {
532 m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName);
526 //libsecondlife.StructuredData.LLSDMap hash = (libsecondlife.StructuredData.LLSDMap)libsecondlife.StructuredData.LLSDParser.DeserializeBinary(Helpers.StringToField(request)); 533 //libsecondlife.StructuredData.LLSDMap hash = (libsecondlife.StructuredData.LLSDMap)libsecondlife.StructuredData.LLSDParser.DeserializeBinary(Helpers.StringToField(request));
527 Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Helpers.StringToField(request)); 534 Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Helpers.StringToField(request));
528 LLSDItemUpdate llsdRequest = new LLSDItemUpdate(); 535 LLSDItemUpdate llsdRequest = new LLSDItemUpdate();
diff --git a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
index 3518e20..6992bd1 100644
--- a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
+++ b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
@@ -68,6 +68,8 @@ namespace OpenSim.Region.Capabilities
68 /// handler to be removed</param> 68 /// handler to be removed</param>
69 public void Remove(string capsName) 69 public void Remove(string capsName)
70 { 70 {
71 // This line must be here, or caps will break!
72 m_httpListener.RemoveStreamHandler("POST", m_capsHandlers[capsName].Path);
71 m_capsHandlers.Remove(capsName); 73 m_capsHandlers.Remove(capsName);
72 } 74 }
73 75