ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into presence-refactor

Browse Source 
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
This commit is contained in:
Melanie
2010-01-16 00:05:08 +00:00
parent 8d5a5d6a4d 046a195c2e
commit 10f8c2ea9b
56 changed files with 2913 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
View File

@@ -162,14 +162,14 @@ namespace OpenSim.Server.Handlers.Grid
m_log.DebugFormat("[GRID HANDLER]: exception unpacking region data: {0}", e);
}
bool result = false;
string result = "Error communicating with grid service";
if (rinfo != null)
result = m_GridService.RegisterRegion(scopeID, rinfo);
if (result)
if (result == String.Empty)
return SuccessResult();
else
return FailureResult();
return FailureResult(result);
}
byte[] Deregister(Dictionary<string, object> request)
@@ -508,6 +508,11 @@ namespace OpenSim.Server.Handlers.Grid
}
private byte[] FailureResult()
{
return FailureResult(String.Empty);
}
private byte[] FailureResult(string msg)
{
XmlDocument doc = new XmlDocument();
@@ -526,6 +531,11 @@ namespace OpenSim.Server.Handlers.Grid
rootElement.AppendChild(result);
XmlElement message = doc.CreateElement("", "Message", "");
message.AppendChild(doc.CreateTextNode(msg));
rootElement.AppendChild(message);
return DocToBytes(doc);
}