ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

Browse Source
This commit is contained in:
meta7
2010-08-20 11:01:03 -07:00
parent cc8864b0e3 47838e5fb3
commit 187ccd72f0
86 changed files with 423 additions and 4357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Services/Connectors/Land/LandServiceConnector.cs
View File

@@ -90,7 +90,7 @@ namespace OpenSim.Services.Connectors
XmlRpcResponse response = request.Send(uri, 10000);
if (response.IsFault)
{
m_log.ErrorFormat("[LAND CONNECTOR] remote call returned an error: {0}", response.FaultString);
m_log.ErrorFormat("[LAND CONNECTOR]: remote call returned an error: {0}", response.FaultString);
}
else
{
@@ -112,22 +112,26 @@ namespace OpenSim.Services.Connectors
landData.UserLocation = Vector3.Parse((string)hash["UserLocation"]);
if (hash["RegionAccess"] != null)
regionAccess = (byte)Convert.ToInt32((string)hash["RegionAccess"]);
m_log.DebugFormat("[OGS1 GRID SERVICES] Got land data for parcel {0}", landData.Name);
m_log.DebugFormat("[LAND CONNECTOR]: Got land data for parcel {0}", landData.Name);
}
catch (Exception e)
{
m_log.Error("[LAND CONNECTOR] Got exception while parsing land-data:", e);
m_log.ErrorFormat(
"[LAND CONNECTOR]: Got exception while parsing land-data: {0} {1}",
e.Message, e.StackTrace);
}
}
}
else m_log.WarnFormat("[LAND CONNECTOR] Couldn't find region with handle {0}", regionHandle);
else
m_log.WarnFormat("[LAND CONNECTOR]: Couldn't find region with handle {0}", regionHandle);
}
catch (Exception e)
{
m_log.ErrorFormat("[LAND CONNECTOR] Couldn't contact region {0}: {1}", regionHandle, e);
m_log.ErrorFormat(
"[LAND CONNECTOR]: Couldn't contact region {0}: {1} {2}", regionHandle, e.Message, e.StackTrace);
}
return landData;
}
}
}
}