aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Common
diff options
context:
space:
mode:
authorMW2007-06-22 22:21:08 +0000
committerMW2007-06-22 22:21:08 +0000
commitd7121a422a334f20e96d09251cf7382164b590db (patch)
tree64ebfea926bc57569963bd1a8adc16e71c942ab1 /Common
parentImported Share folder from trunk (diff)
downloadopensim-SC_OLD-d7121a422a334f20e96d09251cf7382164b590db.zip
opensim-SC_OLD-d7121a422a334f20e96d09251cf7382164b590db.tar.gz
opensim-SC_OLD-d7121a422a334f20e96d09251cf7382164b590db.tar.bz2
opensim-SC_OLD-d7121a422a334f20e96d09251cf7382164b590db.tar.xz
Started work on CAPS support, now we have our first test capability, MapLayer requests are handled by CAPS.
Diffstat (limited to 'Common')
-rw-r--r--Common/OpenGrid.Framework.Communications/IInterRegionCommunications.cs2
-rw-r--r--Common/OpenGrid.Framework.UserManager/LoginResponse.cs13
-rw-r--r--Common/OpenSim.Servers/BaseHttpServer.cs16
3 files changed, 16 insertions, 15 deletions
diff --git a/Common/OpenGrid.Framework.Communications/IInterRegionCommunications.cs b/Common/OpenGrid.Framework.Communications/IInterRegionCommunications.cs
index 27e6fc7..4cb8a38 100644
--- a/Common/OpenGrid.Framework.Communications/IInterRegionCommunications.cs
+++ b/Common/OpenGrid.Framework.Communications/IInterRegionCommunications.cs
@@ -35,7 +35,7 @@ namespace OpenGrid.Framework.Communications
35{ 35{
36 public interface IInterRegionCommunications 36 public interface IInterRegionCommunications
37 { 37 {
38 bool InformNeighbourOfChildAgent(ulong regionHandle, AgentCircuitData agentData); 38 bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData);
39 bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position); 39 bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);
40 } 40 }
41} 41}
diff --git a/Common/OpenGrid.Framework.UserManager/LoginResponse.cs b/Common/OpenGrid.Framework.UserManager/LoginResponse.cs
index 1c51aeb..514ebef 100644
--- a/Common/OpenGrid.Framework.UserManager/LoginResponse.cs
+++ b/Common/OpenGrid.Framework.UserManager/LoginResponse.cs
@@ -40,8 +40,6 @@ namespace OpenGrid.Framework.UserManagement
40 private LLUUID agentID; 40 private LLUUID agentID;
41 private LLUUID sessionID; 41 private LLUUID sessionID;
42 private LLUUID secureSessionID; 42 private LLUUID secureSessionID;
43 private LLUUID baseFolderID;
44 private LLUUID inventoryFolderID;
45 43
46 // Login Flags 44 // Login Flags
47 private string dst; 45 private string dst;
@@ -107,8 +105,6 @@ namespace OpenGrid.Framework.UserManagement
107 105
108 public void SetDefaultValues() 106 public void SetDefaultValues()
109 { 107 {
110 try
111 {
112 this.DST = "N"; 108 this.DST = "N";
113 this.StipendSinceLogin = "N"; 109 this.StipendSinceLogin = "N";
114 this.Gendered = "Y"; 110 this.Gendered = "Y";
@@ -153,14 +149,7 @@ namespace OpenGrid.Framework.UserManagement
153 InitialOutfitHash["folder_name"] = "Nightclub Female"; 149 InitialOutfitHash["folder_name"] = "Nightclub Female";
154 InitialOutfitHash["gender"] = "female"; 150 InitialOutfitHash["gender"] = "female";
155 this.initialOutfit.Add(InitialOutfitHash); 151 this.initialOutfit.Add(InitialOutfitHash);
156 } 152
157 catch (Exception e)
158 {
159 OpenSim.Framework.Console.MainLog.Instance.WriteLine(
160 OpenSim.Framework.Console.LogPriority.LOW,
161 "LoginResponse: Unable to set default values: " + e.Message
162 );
163 }
164 153
165 } // SetDefaultValues 154 } // SetDefaultValues
166 155
diff --git a/Common/OpenSim.Servers/BaseHttpServer.cs b/Common/OpenSim.Servers/BaseHttpServer.cs
index 3daec8d..71c36a7 100644
--- a/Common/OpenSim.Servers/BaseHttpServer.cs
+++ b/Common/OpenSim.Servers/BaseHttpServer.cs
@@ -66,6 +66,7 @@ namespace OpenSim.Servers
66 protected Dictionary<string, RestMethodEntry> m_restHandlers = new Dictionary<string, RestMethodEntry>(); 66 protected Dictionary<string, RestMethodEntry> m_restHandlers = new Dictionary<string, RestMethodEntry>();
67 protected Dictionary<string, XmlRpcMethod> m_rpcHandlers = new Dictionary<string, XmlRpcMethod>(); 67 protected Dictionary<string, XmlRpcMethod> m_rpcHandlers = new Dictionary<string, XmlRpcMethod>();
68 protected int m_port; 68 protected int m_port;
69 protected bool firstcaps = true;
69 70
70 public BaseHttpServer(int port) 71 public BaseHttpServer(int port)
71 { 72 {
@@ -74,6 +75,7 @@ namespace OpenSim.Servers
74 75
75 public bool AddRestHandler(string method, string path, RestMethod handler) 76 public bool AddRestHandler(string method, string path, RestMethod handler)
76 { 77 {
78 Console.WriteLine("adding new REST handler for path " + path);
77 string methodKey = String.Format("{0}: {1}", method, path); 79 string methodKey = String.Format("{0}: {1}", method, path);
78 80
79 if (!this.m_restHandlers.ContainsKey(methodKey)) 81 if (!this.m_restHandlers.ContainsKey(methodKey))
@@ -158,7 +160,14 @@ namespace OpenSim.Servers
158 protected virtual string ParseLLSDXML(string requestBody) 160 protected virtual string ParseLLSDXML(string requestBody)
159 { 161 {
160 // dummy function for now - IMPLEMENT ME! 162 // dummy function for now - IMPLEMENT ME!
161 return ""; 163 Console.WriteLine("LLSD request "+requestBody);
164 string resp = "";
165 if (firstcaps)
166 {
167 resp = "<llsd><map><key>MapLayer</key><string>http://127.0.0.1:9000/CAPS/</string></map></llsd>";
168 firstcaps = false;
169 }
170 return resp;
162 } 171 }
163 172
164 protected virtual string ParseXMLRPC(string requestBody) 173 protected virtual string ParseXMLRPC(string requestBody)
@@ -204,6 +213,7 @@ namespace OpenSim.Servers
204 //Console.WriteLine(requestBody); 213 //Console.WriteLine(requestBody);
205 214
206 string responseString = ""; 215 string responseString = "";
216 Console.WriteLine("new request " + request.ContentType);
207 switch (request.ContentType) 217 switch (request.ContentType)
208 { 218 {
209 case "text/xml": 219 case "text/xml":
@@ -217,7 +227,9 @@ namespace OpenSim.Servers
217 227
218 case "application/xml": 228 case "application/xml":
219 // probably LLSD we hope, otherwise it should be ignored by the parser 229 // probably LLSD we hope, otherwise it should be ignored by the parser
220 responseString = ParseLLSDXML(requestBody); 230 // responseString = ParseLLSDXML(requestBody);
231 Console.WriteLine(" request " + request.HttpMethod + " to " + request.RawUrl);
232 responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
221 response.AddHeader("Content-type", "application/xml"); 233 response.AddHeader("Content-type", "application/xml");
222 break; 234 break;
223 235