aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorDiva Canto2011-04-30 16:53:43 -0700
committerDiva Canto2011-04-30 16:53:43 -0700
commit56df7461330b1d193f3f60274525eb1b128315ef (patch)
treeb97f6afd34e96aef55b345aca02946de84dbe1ab /OpenSim/Framework
parentCheck for RegionID instead of RegionHandle. Other minor tweaks (diff)
downloadopensim-SC_OLD-56df7461330b1d193f3f60274525eb1b128315ef.zip
opensim-SC_OLD-56df7461330b1d193f3f60274525eb1b128315ef.tar.gz
opensim-SC_OLD-56df7461330b1d193f3f60274525eb1b128315ef.tar.bz2
opensim-SC_OLD-56df7461330b1d193f3f60274525eb1b128315ef.tar.xz
XXX DEBUGGING!
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/ChildAgentDataUpdate.cs3
-rw-r--r--OpenSim/Framework/WebUtil.cs11
2 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index a626b82..c4b5dde 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -454,6 +454,7 @@ namespace OpenSim.Framework
454 { 454 {
455 OSDMap info = new OSDMap(4); 455 OSDMap info = new OSDMap(4);
456 info["sog"] = OSD.FromString(so.ToXml2()); 456 info["sog"] = OSD.FromString(so.ToXml2());
457 m_log.DebugFormat("[XXX] {0}", so.ToXml2());
457 info["extra"] = OSD.FromString(so.ExtraToXmlString()); 458 info["extra"] = OSD.FromString(so.ExtraToXmlString());
458 info["modified"] = OSD.FromBoolean(so.HasGroupChanged); 459 info["modified"] = OSD.FromBoolean(so.HasGroupChanged);
459 try 460 try
@@ -462,7 +463,7 @@ namespace OpenSim.Framework
462 } 463 }
463 catch (IndexOutOfRangeException e) 464 catch (IndexOutOfRangeException e)
464 { 465 {
465 m_log.WarnFormat("[CHILD AGENT DATA]: scrtips list is shorter than object list."); 466 m_log.WarnFormat("[CHILD AGENT DATA]: scripts list is shorter than object list.");
466 } 467 }
467 468
468 attObjs.Add(info); 469 attObjs.Add(info);
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 9d70f63..5449a6f 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -177,7 +177,16 @@ namespace OpenSim.Framework
177 // If there is some input, write it into the request 177 // If there is some input, write it into the request
178 if (data != null) 178 if (data != null)
179 { 179 {
180 string strBuffer = OSDParser.SerializeJsonString(data); 180 string strBuffer = string.Empty;
181 try
182 {
183 strBuffer = OSDParser.SerializeJsonString(data);
184 }
185 catch (Exception e)
186 {
187 m_log.DebugFormat("[WEB UTIL]: Exception serializing data {0}", e.Message);
188 throw e;
189 }
181 byte[] buffer = System.Text.Encoding.UTF8.GetBytes(strBuffer); 190 byte[] buffer = System.Text.Encoding.UTF8.GetBytes(strBuffer);
182 191
183 request.ContentType = "application/json"; 192 request.ContentType = "application/json";