aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Capabilities
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Capabilities')
-rw-r--r--OpenSim/Region/Capabilities/Caps.cs33
1 files changed, 10 insertions, 23 deletions
diff --git a/OpenSim/Region/Capabilities/Caps.cs b/OpenSim/Region/Capabilities/Caps.cs
index b38979d..d9d6f51 100644
--- a/OpenSim/Region/Capabilities/Caps.cs
+++ b/OpenSim/Region/Capabilities/Caps.cs
@@ -98,13 +98,6 @@ namespace OpenSim.Region.Capabilities
98 /// <returns></returns> 98 /// <returns></returns>
99 protected LLSDCapsDetails GetCapabilities() 99 protected LLSDCapsDetails GetCapabilities()
100 { 100 {
101 /* string capURLS = "";
102 capURLS += "<key>MapLayer</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath + "</string>";
103 capURLS += "<key>NewFileAgentInventory</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory + "</string>";
104 //capURLS += "<key>RequestTextureDownload</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + requestTexture + "</string>";
105 //capURLS += "<key>EventQueueGet</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + eventQueue + "</string>";
106 return capURLS;*/
107
108 LLSDCapsDetails caps = new LLSDCapsDetails(); 101 LLSDCapsDetails caps = new LLSDCapsDetails();
109 string capsBaseUrl = "http://" + httpListenerHostName + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath; 102 string capsBaseUrl = "http://" + httpListenerHostName + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath;
110 103
@@ -131,8 +124,6 @@ namespace OpenSim.Region.Capabilities
131 LLSDMapLayerResponse mapResponse= new LLSDMapLayerResponse(); 124 LLSDMapLayerResponse mapResponse= new LLSDMapLayerResponse();
132 mapResponse.LayerData.Array.Add(this.BuildLLSDMapLayerResponse()); 125 mapResponse.LayerData.Array.Add(this.BuildLLSDMapLayerResponse());
133 string res = LLSDHelpers.SerialiseLLSDReply(mapResponse); 126 string res = LLSDHelpers.SerialiseLLSDReply(mapResponse);
134
135 //Console.WriteLine(" Maplayer response is " + res);
136 127
137 return res; 128 return res;
138 } 129 }
@@ -172,27 +163,23 @@ namespace OpenSim.Region.Capabilities
172 163
173 public string CreateEstablishAgentComms(string caps, string ipAddressPort) 164 public string CreateEstablishAgentComms(string caps, string ipAddressPort)
174 { 165 {
175 string res = "<llsd><map><key>id</key><integer>" + eventQueueCount + "</integer>"; 166 LLSDCapEvent eventItem = new LLSDCapEvent();
176 res += "<key>events</key><array><map>"; 167 eventItem.id = eventQueueCount;
177 res += "<key>message</key><string>EstablishAgentCommunication</string>"; 168 //should be creating a EstablishAgentComms item, but there isn't a class for it yet
178 res += "<key>body</key><map>"; 169 eventItem.events.Array.Add(new LLSDEmpty());
179 res += "<key>sim-ip-and-port</key><string>" + ipAddressPort + "</string>"; 170 string res = LLSDHelpers.SerialiseLLSDReply(eventItem);
180 res += "<key>seed-capability</key><string>" + caps + "</string>";
181 res += "<key>agent-id</key><uuid>" + this.agentID.ToStringHyphenated() + "</uuid>";
182 res += "</map>";
183 res += "</map></array>";
184 res += "</map></llsd>";
185 eventQueueCount++; 171 eventQueueCount++;
172
186 this.CapsEventQueue.Enqueue(res); 173 this.CapsEventQueue.Enqueue(res);
187 return res; 174 return res;
188 } 175 }
189 176
190 public string CreateEmptyEventResponse() 177 public string CreateEmptyEventResponse()
191 { 178 {
192 string res = "<llsd><map><key>id</key><integer>" + eventQueueCount + "</integer>"; 179 LLSDCapEvent eventItem = new LLSDCapEvent();
193 res += "<key>events</key><array><map>"; 180 eventItem.id = eventQueueCount;
194 res += "</map></array>"; 181 eventItem.events.Array.Add(new LLSDEmpty());
195 res += "</map></llsd>"; 182 string res = LLSDHelpers.SerialiseLLSDReply(eventItem);
196 eventQueueCount++; 183 eventQueueCount++;
197 return res; 184 return res;
198 } 185 }