aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Capabilities/Caps.cs
diff options
context:
space:
mode:
authorMW2007-07-11 18:32:32 +0000
committerMW2007-07-11 18:32:32 +0000
commit17ddb8b49323777b4678270ebbf4859dd8842abd (patch)
tree048d805596550f01ed7354c4e7b313146e1e1513 /OpenSim/Region/Capabilities/Caps.cs
parentMore work on UserProfile and inventory cache (still currently not enabled). (diff)
downloadopensim-SC_OLD-17ddb8b49323777b4678270ebbf4859dd8842abd.zip
opensim-SC_OLD-17ddb8b49323777b4678270ebbf4859dd8842abd.tar.gz
opensim-SC_OLD-17ddb8b49323777b4678270ebbf4859dd8842abd.tar.bz2
opensim-SC_OLD-17ddb8b49323777b4678270ebbf4859dd8842abd.tar.xz
Hopefully texturing prims should now work correctly.
Diffstat (limited to 'OpenSim/Region/Capabilities/Caps.cs')
-rw-r--r--OpenSim/Region/Capabilities/Caps.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Capabilities/Caps.cs b/OpenSim/Region/Capabilities/Caps.cs
index db8df9b..6373f6e 100644
--- a/OpenSim/Region/Capabilities/Caps.cs
+++ b/OpenSim/Region/Capabilities/Caps.cs
@@ -75,10 +75,10 @@ namespace OpenSim.Region.Capabilities
75 string capsBase = "/CAPS/" + m_capsObjectPath; 75 string capsBase = "/CAPS/" + m_capsObjectPath;
76 76
77 77
78 //AddLegacyCapsHandler( httpListener, m_mapLayerPath, MapLayer); 78 AddLegacyCapsHandler( httpListener, m_mapLayerPath, MapLayer);
79 79
80 httpListener.AddStreamHandler( 80 // httpListener.AddStreamHandler(
81 new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", capsBase + m_mapLayerPath, this.GetMapLayer )); 81 // new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", capsBase + m_mapLayerPath, this.GetMapLayer ));
82 82
83 AddLegacyCapsHandler(httpListener, m_requestPath, CapsRequest); 83 AddLegacyCapsHandler(httpListener, m_requestPath, CapsRequest);
84 AddLegacyCapsHandler(httpListener, m_newInventory, NewAgentInventory); 84 AddLegacyCapsHandler(httpListener, m_newInventory, NewAgentInventory);
@@ -133,6 +133,7 @@ namespace OpenSim.Region.Capabilities
133 /// <returns></returns> 133 /// <returns></returns>
134 public string MapLayer(string request, string path, string param) 134 public string MapLayer(string request, string path, string param)
135 { 135 {
136 Console.WriteLine("map request: " + request);
136 Encoding _enc = Encoding.UTF8; 137 Encoding _enc = Encoding.UTF8;
137 Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(_enc.GetBytes(request)); 138 Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(_enc.GetBytes(request));
138 LLSDMapRequest mapReq = new LLSDMapRequest(); 139 LLSDMapRequest mapReq = new LLSDMapRequest();
@@ -147,6 +148,7 @@ namespace OpenSim.Region.Capabilities
147 148
148 public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq) 149 public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq)
149 { 150 {
151 Console.WriteLine("Map request " + mapReq.Flags);
150 LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse(); 152 LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();
151 mapResponse.LayerData.Array.Add(this.BuildLLSDMapLayerResponse()); 153 mapResponse.LayerData.Array.Add(this.BuildLLSDMapLayerResponse());
152 return mapResponse; 154 return mapResponse;