aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs3
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs29
-rw-r--r--OpenSim/Server/Base/ServerUtils.cs3
-rw-r--r--OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs10
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs12
-rw-r--r--OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs35
-rw-r--r--OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs11
-rw-r--r--OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs4
-rw-r--r--OpenSim/Services/Interfaces/IUserAccountService.cs8
-rw-r--r--OpenSim/Services/PresenceService/PresenceService.cs2
-rw-r--r--OpenSim/Services/UserAccountService/UserAccountService.cs4
15 files changed, 75 insertions, 57 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index c01d66a..a0ff151 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -196,10 +196,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
196 196
197 public void UpdateDatabase(UUID user, AvatarAppearance appearance) 197 public void UpdateDatabase(UUID user, AvatarAppearance appearance)
198 { 198 {
199 m_log.DebugFormat("[APPEARANCE]: UpdateDatabase"); 199 //m_log.DebugFormat("[APPEARANCE]: UpdateDatabase");
200 AvatarData adata = new AvatarData(appearance); 200 AvatarData adata = new AvatarData(appearance);
201 m_scene.AvatarService.SetAvatar(user, adata); 201 m_scene.AvatarService.SetAvatar(user, adata);
202
203 } 202 }
204 203
205 private static byte[] GetDefaultVisualParams() 204 private static byte[] GetDefaultVisualParams()
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index bd2d8cb..227c37f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -281,7 +281,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
281 return false; 281 return false;
282 282
283 // Try local first 283 // Try local first
284 if (m_localBackend.CreateObject(destination, sog, true)) 284 if (m_localBackend.CreateObject(destination, sog, isLocalCall))
285 { 285 {
286 //m_log.Debug("[REST COMMS]: LocalBackEnd SendCreateObject succeeded"); 286 //m_log.Debug("[REST COMMS]: LocalBackEnd SendCreateObject succeeded");
287 return true; 287 return true;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 70aea75..62a831e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2358,7 +2358,7 @@ namespace OpenSim.Region.Framework.Scenes
2358 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); 2358 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
2359 item = InventoryService.GetItem(item); 2359 item = InventoryService.GetItem(item);
2360 2360
2361 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, /*item.AssetID*/ att.UUID); 2361 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
2362 } 2362 }
2363 return att.UUID; 2363 return att.UUID;
2364 } 2364 }
@@ -2403,7 +2403,7 @@ namespace OpenSim.Region.Framework.Scenes
2403 // XXYY!! 2403 // XXYY!!
2404 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); 2404 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
2405 item = InventoryService.GetItem(item); 2405 item = InventoryService.GetItem(item);
2406 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, /*item.AssetID*/ att.UUID); 2406 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /* att.UUID */);
2407 2407
2408 if (m_AvatarFactory != null) 2408 if (m_AvatarFactory != null)
2409 { 2409 {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 4bbea16..206e2f8 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2553,6 +2553,9 @@ namespace OpenSim.Region.Framework.Scenes
2553 2553
2554 return false; 2554 return false;
2555 } 2555 }
2556
2557 sceneObject.SetScene(this);
2558
2556 // Force allocation of new LocalId 2559 // Force allocation of new LocalId
2557 // 2560 //
2558 foreach (SceneObjectPart p in sceneObject.Children.Values) 2561 foreach (SceneObjectPart p in sceneObject.Children.Values)
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 1e7f54a..63719ac 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -414,7 +414,7 @@ namespace OpenSim.Region.Framework.Scenes
414 /// Create the necessary child agents 414 /// Create the necessary child agents
415 List<AgentCircuitData> cagents = new List<AgentCircuitData>(); 415 List<AgentCircuitData> cagents = new List<AgentCircuitData>();
416 foreach (GridRegion neighbour in neighbours) 416 foreach (GridRegion neighbour in neighbours)
417 { 417 {
418 if (neighbour.RegionHandle != avatar.Scene.RegionInfo.RegionHandle) 418 if (neighbour.RegionHandle != avatar.Scene.RegionInfo.RegionHandle)
419 { 419 {
420 420
@@ -446,7 +446,6 @@ namespace OpenSim.Region.Framework.Scenes
446 446
447 if (avatar.Scene.CapsModule != null) 447 if (avatar.Scene.CapsModule != null)
448 { 448 {
449 // These two are the same thing!
450 avatar.Scene.CapsModule.SetChildrenSeed(avatar.UUID, seeds); 449 avatar.Scene.CapsModule.SetChildrenSeed(avatar.UUID, seeds);
451 } 450 }
452 avatar.KnownRegions = seeds; 451 avatar.KnownRegions = seeds;
@@ -516,8 +515,6 @@ namespace OpenSim.Region.Framework.Scenes
516 agent.InventoryFolder = UUID.Zero; 515 agent.InventoryFolder = UUID.Zero;
517 agent.startpos = new Vector3(128, 128, 70); 516 agent.startpos = new Vector3(128, 128, 70);
518 agent.child = true; 517 agent.child = true;
519 if (avatar.Appearance == null)
520 m_log.Debug("XXX Appearance is null!!!!");
521 agent.Appearance = avatar.Appearance; 518 agent.Appearance = avatar.Appearance;
522 519
523 InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync; 520 InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
@@ -1450,17 +1447,17 @@ namespace OpenSim.Region.Framework.Scenes
1450 return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber); 1447 return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber);
1451 } 1448 }
1452 1449
1453 //private void Dump(string msg, List<ulong> handles) 1450 private void Dump(string msg, List<ulong> handles)
1454 //{ 1451 {
1455 // m_log.InfoFormat("-------------- HANDLE DUMP ({0}) ---------", msg); 1452 m_log.InfoFormat("-------------- HANDLE DUMP ({0}) ---------", msg);
1456 // foreach (ulong handle in handles) 1453 foreach (ulong handle in handles)
1457 // { 1454 {
1458 // uint x, y; 1455 uint x, y;
1459 // Utils.LongToUInts(handle, out x, out y); 1456 Utils.LongToUInts(handle, out x, out y);
1460 // x = x / Constants.RegionSize; 1457 x = x / Constants.RegionSize;
1461 // y = y / Constants.RegionSize; 1458 y = y / Constants.RegionSize;
1462 // m_log.InfoFormat("({0}, {1})", x, y); 1459 m_log.InfoFormat("({0}, {1})", x, y);
1463 // } 1460 }
1464 //} 1461 }
1465 } 1462 }
1466} 1463}
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index a5d28a4..e00eb2a 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -278,6 +278,9 @@ namespace OpenSim.Server.Base
278 { 278 {
279 foreach (KeyValuePair<string, object> kvp in data) 279 foreach (KeyValuePair<string, object> kvp in data)
280 { 280 {
281 if (kvp.Value == null)
282 continue;
283
281 XmlElement elem = parent.OwnerDocument.CreateElement("", 284 XmlElement elem = parent.OwnerDocument.CreateElement("",
282 kvp.Key, ""); 285 kvp.Key, "");
283 286
diff --git a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
index 926c195..d180bbb 100644
--- a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Server.Handlers.Presence
65 body = body.Trim(); 65 body = body.Trim();
66 66
67 //m_log.DebugFormat("[XXX]: query String: {0}", body); 67 //m_log.DebugFormat("[XXX]: query String: {0}", body);
68 68 string method = string.Empty;
69 try 69 try
70 { 70 {
71 Dictionary<string, object> request = 71 Dictionary<string, object> request =
@@ -74,7 +74,7 @@ namespace OpenSim.Server.Handlers.Presence
74 if (!request.ContainsKey("METHOD")) 74 if (!request.ContainsKey("METHOD"))
75 return FailureResult(); 75 return FailureResult();
76 76
77 string method = request["METHOD"].ToString(); 77 method = request["METHOD"].ToString();
78 78
79 switch (method) 79 switch (method)
80 { 80 {
@@ -97,7 +97,7 @@ namespace OpenSim.Server.Handlers.Presence
97 } 97 }
98 catch (Exception e) 98 catch (Exception e)
99 { 99 {
100 m_log.Debug("[PRESENCE HANDLER]: Exception {0}" + e); 100 m_log.DebugFormat("[PRESENCE HANDLER]: Exception in method {0}: {1}", method, e);
101 } 101 }
102 102
103 return FailureResult(); 103 return FailureResult();
@@ -188,9 +188,11 @@ namespace OpenSim.Server.Handlers.Presence
188 188
189 if (request.ContainsKey("lookAt")) 189 if (request.ContainsKey("lookAt"))
190 Vector3.TryParse(request["lookAt"].ToString(), out look); 190 Vector3.TryParse(request["lookAt"].ToString(), out look);
191 191
192 if (m_PresenceService.ReportAgent(session, region, position, look)) 192 if (m_PresenceService.ReportAgent(session, region, position, look))
193 {
193 return SuccessResult(); 194 return SuccessResult();
195 }
194 196
195 return FailureResult(); 197 return FailureResult();
196 } 198 }
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 782034b..da9c015 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -61,11 +61,11 @@ namespace OpenSim.Server.Handlers.Simulation
61 { 61 {
62 //m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called"); 62 //m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called");
63 63
64 m_log.Debug("---------------------------"); 64 //m_log.Debug("---------------------------");
65 m_log.Debug(" >> uri=" + request["uri"]); 65 //m_log.Debug(" >> uri=" + request["uri"]);
66 m_log.Debug(" >> content-type=" + request["content-type"]); 66 //m_log.Debug(" >> content-type=" + request["content-type"]);
67 m_log.Debug(" >> http-method=" + request["http-method"]); 67 //m_log.Debug(" >> http-method=" + request["http-method"]);
68 m_log.Debug("---------------------------\n"); 68 //m_log.Debug("---------------------------\n");
69 69
70 Hashtable responsedata = new Hashtable(); 70 Hashtable responsedata = new Hashtable();
71 responsedata["content_type"] = "text/html"; 71 responsedata["content_type"] = "text/html";
@@ -320,7 +320,7 @@ namespace OpenSim.Server.Handlers.Simulation
320 responsedata["int_response_code"] = HttpStatusCode.OK; 320 responsedata["int_response_code"] = HttpStatusCode.OK;
321 responsedata["str_response_string"] = "OpenSim agent " + id.ToString(); 321 responsedata["str_response_string"] = "OpenSim agent " + id.ToString();
322 322
323 m_log.Debug("[AGENT HANDLER]: Agent Deleted."); 323 m_log.Debug("[AGENT HANDLER]: Agent Released/Deleted.");
324 } 324 }
325 } 325 }
326 326
diff --git a/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs b/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
index 995a3c4..b6eabe3 100644
--- a/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
@@ -59,13 +59,13 @@ namespace OpenSim.Server.Handlers.Simulation
59 59
60 public Hashtable Handler(Hashtable request) 60 public Hashtable Handler(Hashtable request)
61 { 61 {
62 m_log.Debug("[CONNECTION DEBUGGING]: ObjectHandler Called"); 62 //m_log.Debug("[CONNECTION DEBUGGING]: ObjectHandler Called");
63 63
64 m_log.Debug("---------------------------"); 64 //m_log.Debug("---------------------------");
65 m_log.Debug(" >> uri=" + request["uri"]); 65 //m_log.Debug(" >> uri=" + request["uri"]);
66 m_log.Debug(" >> content-type=" + request["content-type"]); 66 //m_log.Debug(" >> content-type=" + request["content-type"]);
67 m_log.Debug(" >> http-method=" + request["http-method"]); 67 //m_log.Debug(" >> http-method=" + request["http-method"]);
68 m_log.Debug("---------------------------\n"); 68 //m_log.Debug("---------------------------\n");
69 69
70 Hashtable responsedata = new Hashtable(); 70 Hashtable responsedata = new Hashtable();
71 responsedata["content_type"] = "text/html"; 71 responsedata["content_type"] = "text/html";
@@ -75,7 +75,7 @@ namespace OpenSim.Server.Handlers.Simulation
75 string action; 75 string action;
76 if (!Utils.GetParams((string)request["uri"], out objectID, out regionID, out action)) 76 if (!Utils.GetParams((string)request["uri"], out objectID, out regionID, out action))
77 { 77 {
78 m_log.InfoFormat("[REST COMMS]: Invalid parameters for object message {0}", request["uri"]); 78 m_log.InfoFormat("[OBJECT HANDLER]: Invalid parameters for object message {0}", request["uri"]);
79 responsedata["int_response_code"] = 404; 79 responsedata["int_response_code"] = 404;
80 responsedata["str_response_string"] = "false"; 80 responsedata["str_response_string"] = "false";
81 81
@@ -101,7 +101,7 @@ namespace OpenSim.Server.Handlers.Simulation
101 //} 101 //}
102 else 102 else
103 { 103 {
104 m_log.InfoFormat("[REST COMMS]: method {0} not supported in object message", method); 104 m_log.InfoFormat("[OBJECT HANDLER]: method {0} not supported in object message", method);
105 responsedata["int_response_code"] = HttpStatusCode.MethodNotAllowed; 105 responsedata["int_response_code"] = HttpStatusCode.MethodNotAllowed;
106 responsedata["str_response_string"] = "Mthod not allowed"; 106 responsedata["str_response_string"] = "Mthod not allowed";
107 107
@@ -148,13 +148,13 @@ namespace OpenSim.Server.Handlers.Simulation
148 ISceneObject sog = null; 148 ISceneObject sog = null;
149 try 149 try
150 { 150 {
151 //sog = SceneObjectSerializer.FromXml2Format(sogXmlStr); 151 //m_log.DebugFormat("[OBJECT HANDLER]: received {0}", sogXmlStr);
152 sog = s.DeserializeObject(sogXmlStr); 152 sog = s.DeserializeObject(sogXmlStr);
153 sog.ExtraFromXmlString(extraStr); 153 sog.ExtraFromXmlString(extraStr);
154 } 154 }
155 catch (Exception ex) 155 catch (Exception ex)
156 { 156 {
157 m_log.InfoFormat("[REST COMMS]: exception on deserializing scene object {0}", ex.Message); 157 m_log.InfoFormat("[OBJECT HANDLER]: exception on deserializing scene object {0}", ex.Message);
158 responsedata["int_response_code"] = HttpStatusCode.BadRequest; 158 responsedata["int_response_code"] = HttpStatusCode.BadRequest;
159 responsedata["str_response_string"] = "Bad request"; 159 responsedata["str_response_string"] = "Bad request";
160 return; 160 return;
@@ -171,13 +171,22 @@ namespace OpenSim.Server.Handlers.Simulation
171 } 171 }
172 catch (Exception ex) 172 catch (Exception ex)
173 { 173 {
174 m_log.InfoFormat("[REST COMMS]: exception on setting state for scene object {0}", ex.Message); 174 m_log.InfoFormat("[OBJECT HANDLER]: exception on setting state for scene object {0}", ex.Message);
175 // ignore and continue 175 // ignore and continue
176 } 176 }
177 } 177 }
178 } 178 }
179 // This is the meaning of POST object 179
180 bool result = m_SimulationService.CreateObject(destination, sog, false); 180 bool result = false;
181 try
182 {
183 // This is the meaning of POST object
184 result = m_SimulationService.CreateObject(destination, sog, false);
185 }
186 catch (Exception e)
187 {
188 m_log.DebugFormat("[OBJECT HANDLER]: Exception in CreateObject: {0}", e.StackTrace);
189 }
181 190
182 responsedata["int_response_code"] = HttpStatusCode.OK; 191 responsedata["int_response_code"] = HttpStatusCode.OK;
183 responsedata["str_response_string"] = result.ToString(); 192 responsedata["str_response_string"] = result.ToString();
diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
index b54b63e..6a82165 100644
--- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Server.Handlers.UserAccounts
68 //httpRequest.Headers["authorization"] ... 68 //httpRequest.Headers["authorization"] ...
69 69
70 //m_log.DebugFormat("[XXX]: query String: {0}", body); 70 //m_log.DebugFormat("[XXX]: query String: {0}", body);
71 71 string method = string.Empty;
72 try 72 try
73 { 73 {
74 Dictionary<string, object> request = 74 Dictionary<string, object> request =
@@ -77,7 +77,7 @@ namespace OpenSim.Server.Handlers.UserAccounts
77 if (!request.ContainsKey("METHOD")) 77 if (!request.ContainsKey("METHOD"))
78 return FailureResult(); 78 return FailureResult();
79 79
80 string method = request["METHOD"].ToString(); 80 method = request["METHOD"].ToString();
81 81
82 switch (method) 82 switch (method)
83 { 83 {
@@ -88,11 +88,11 @@ namespace OpenSim.Server.Handlers.UserAccounts
88 case "setaccount": 88 case "setaccount":
89 return StoreAccount(request); 89 return StoreAccount(request);
90 } 90 }
91 m_log.DebugFormat("[PRESENCE HANDLER]: unknown method request: {0}", method); 91 m_log.DebugFormat("[USER SERVICE HANDLER]: unknown method request: {0}", method);
92 } 92 }
93 catch (Exception e) 93 catch (Exception e)
94 { 94 {
95 m_log.Debug("[PRESENCE HANDLER]: Exception {0}" + e); 95 m_log.DebugFormat("[USER SERVICE HANDLER]: Exception in method {0}: {1}", method, e);
96 } 96 }
97 97
98 return FailureResult(); 98 return FailureResult();
@@ -134,7 +134,9 @@ namespace OpenSim.Server.Handlers.UserAccounts
134 if (account == null) 134 if (account == null)
135 result["result"] = "null"; 135 result["result"] = "null";
136 else 136 else
137 {
137 result["result"] = account.ToKeyValuePairs(); 138 result["result"] = account.ToKeyValuePairs();
139 }
138 140
139 return ResultToBytes(result); 141 return ResultToBytes(result);
140 } 142 }
@@ -247,7 +249,6 @@ namespace OpenSim.Server.Handlers.UserAccounts
247 private byte[] ResultToBytes(Dictionary<string, object> result) 249 private byte[] ResultToBytes(Dictionary<string, object> result)
248 { 250 {
249 string xmlString = ServerUtils.BuildXmlResponse(result); 251 string xmlString = ServerUtils.BuildXmlResponse(result);
250 //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
251 UTF8Encoding encoding = new UTF8Encoding(); 252 UTF8Encoding encoding = new UTF8Encoding();
252 return encoding.GetBytes(xmlString); 253 return encoding.GetBytes(xmlString);
253 } 254 }
diff --git a/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs b/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs
index 6d9fc60..82ceaaf 100644
--- a/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs
@@ -148,7 +148,7 @@ namespace OpenSim.Services.Connectors
148 148
149 149
150 string reqString = ServerUtils.BuildQueryString(sendData); 150 string reqString = ServerUtils.BuildQueryString(sendData);
151 // m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString); 151 m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString);
152 try 152 try
153 { 153 {
154 string reply = SynchronousRestFormsRequester.MakeRequest("POST", 154 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index bd72570..6d588de 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -231,7 +231,7 @@ namespace OpenSim.Services.Connectors.Simulation
231 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent update. Reason: " + e.Message); 231 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent update. Reason: " + e.Message);
232 return false; 232 return false;
233 } 233 }
234 Console.WriteLine(" >>> DoAgentUpdateCall <<< " + uri); 234 //Console.WriteLine(" >>> DoAgentUpdateCall <<< " + uri);
235 235
236 HttpWebRequest ChildUpdateRequest = (HttpWebRequest)WebRequest.Create(uri); 236 HttpWebRequest ChildUpdateRequest = (HttpWebRequest)WebRequest.Create(uri);
237 ChildUpdateRequest.Method = "PUT"; 237 ChildUpdateRequest.Method = "PUT";
@@ -478,7 +478,7 @@ namespace OpenSim.Services.Connectors.Simulation
478 { 478 {
479 string uri 479 string uri
480 = "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + "/object/" + sog.UUID + "/"; 480 = "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + "/object/" + sog.UUID + "/";
481 //m_log.Debug(" >>> DoCreateChildAgentCall <<< " + uri); 481 //m_log.Debug(" >>> DoCreateObjectCall <<< " + uri);
482 482
483 WebRequest ObjectCreateRequest = WebRequest.Create(uri); 483 WebRequest ObjectCreateRequest = WebRequest.Create(uri);
484 ObjectCreateRequest.Method = "POST"; 484 ObjectCreateRequest.Method = "POST";
diff --git a/OpenSim/Services/Interfaces/IUserAccountService.cs b/OpenSim/Services/Interfaces/IUserAccountService.cs
index 942174c..3dacf53 100644
--- a/OpenSim/Services/Interfaces/IUserAccountService.cs
+++ b/OpenSim/Services/Interfaces/IUserAccountService.cs
@@ -98,11 +98,11 @@ namespace OpenSim.Services.Interfaces
98 string str = kvp["ServiceURLs"].ToString(); 98 string str = kvp["ServiceURLs"].ToString();
99 if (str != string.Empty) 99 if (str != string.Empty)
100 { 100 {
101 string[] parts = str.Split(new char[] { '#' }); 101 string[] parts = str.Split(new char[] { ';' });
102 Dictionary<string, object> dic = new Dictionary<string, object>(); 102 Dictionary<string, object> dic = new Dictionary<string, object>();
103 foreach (string s in parts) 103 foreach (string s in parts)
104 { 104 {
105 string[] parts2 = s.Split(new char[] { '=' }); 105 string[] parts2 = s.Split(new char[] { '*' });
106 if (parts2.Length == 2) 106 if (parts2.Length == 2)
107 ServiceURLs[parts2[0]] = parts2[1]; 107 ServiceURLs[parts2[0]] = parts2[1];
108 } 108 }
@@ -119,14 +119,14 @@ namespace OpenSim.Services.Interfaces
119 result["PrincipalID"] = PrincipalID.ToString(); 119 result["PrincipalID"] = PrincipalID.ToString();
120 result["ScopeID"] = ScopeID.ToString(); 120 result["ScopeID"] = ScopeID.ToString();
121 result["Created"] = Created.ToString(); 121 result["Created"] = Created.ToString();
122 result["UserLavel"] = UserLevel.ToString(); 122 result["UserLevel"] = UserLevel.ToString();
123 result["UserFlags"] = UserFlags.ToString(); 123 result["UserFlags"] = UserFlags.ToString();
124 result["UserTitle"] = UserTitle; 124 result["UserTitle"] = UserTitle;
125 125
126 string str = string.Empty; 126 string str = string.Empty;
127 foreach (KeyValuePair<string, object> kvp in ServiceURLs) 127 foreach (KeyValuePair<string, object> kvp in ServiceURLs)
128 { 128 {
129 str += kvp.Key + "=" + kvp.Value + "#"; 129 str += kvp.Key + "*" + (kvp.Value == null ? "" : kvp.Value) + ";";
130 } 130 }
131 result["ServiceURLs"] = str; 131 result["ServiceURLs"] = str;
132 132
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs
index 34a3154..350eac8 100644
--- a/OpenSim/Services/PresenceService/PresenceService.cs
+++ b/OpenSim/Services/PresenceService/PresenceService.cs
@@ -121,7 +121,7 @@ namespace OpenSim.Services.PresenceService
121 121
122 public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt) 122 public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
123 { 123 {
124 //m_log.DebugFormat("[PRESENCE SERVICE]: ReportAgent with session {0} in region {1}", sessionID, regionID); 124 m_log.DebugFormat("[PRESENCE SERVICE]: ReportAgent with session {0} in region {1}", sessionID, regionID);
125 try 125 try
126 { 126 {
127 PresenceData pdata = m_Database.Get(sessionID); 127 PresenceData pdata = m_Database.Get(sessionID);
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index 90077d8..a1dbb1e 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -119,6 +119,10 @@ namespace OpenSim.Services.UserAccountService
119 u.ScopeID = d.ScopeID; 119 u.ScopeID = d.ScopeID;
120 u.Email = d.Data["Email"].ToString(); 120 u.Email = d.Data["Email"].ToString();
121 u.Created = Convert.ToInt32(d.Data["Created"].ToString()); 121 u.Created = Convert.ToInt32(d.Data["Created"].ToString());
122 if (d.Data["UserTitle"] != null)
123 u.UserTitle = d.Data["UserTitle"].ToString();
124 else
125 u.UserTitle = string.Empty;
122 126
123 string[] URLs = d.Data["ServiceURLs"].ToString().Split(new char[] { ' ' }); 127 string[] URLs = d.Data["ServiceURLs"].ToString().Split(new char[] { ' ' });
124 u.ServiceURLs = new Dictionary<string, object>(); 128 u.ServiceURLs = new Dictionary<string, object>();