diff options
| author | Melanie | 2010-08-19 11:46:07 +0100 |
|---|---|---|
| committer | Melanie | 2010-08-19 11:46:07 +0100 |
| commit | ee7c79969968ca3b6e302bd92edf6a6397a1468e (patch) | |
| tree | 89d36348c189285c14cc4f19f533c817259d556f /OpenSim/Services | |
| parent | Skip conversion if fields that are null in the database. This may (diff) | |
| parent | Improve some logging in LandConnector (diff) | |
| download | opensim-SC-ee7c79969968ca3b6e302bd92edf6a6397a1468e.zip opensim-SC-ee7c79969968ca3b6e302bd92edf6a6397a1468e.tar.gz opensim-SC-ee7c79969968ca3b6e302bd92edf6a6397a1468e.tar.bz2 opensim-SC-ee7c79969968ca3b6e302bd92edf6a6397a1468e.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/Connectors/Land/LandServiceConnector.cs | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs index 8bae4aa..8143b5a 100644 --- a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs +++ b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs | |||
| @@ -88,7 +88,7 @@ namespace OpenSim.Services.Connectors | |||
| 88 | XmlRpcResponse response = request.Send(uri, 10000); | 88 | XmlRpcResponse response = request.Send(uri, 10000); |
| 89 | if (response.IsFault) | 89 | if (response.IsFault) |
| 90 | { | 90 | { |
| 91 | m_log.ErrorFormat("[LAND CONNECTOR] remote call returned an error: {0}", response.FaultString); | 91 | m_log.ErrorFormat("[LAND CONNECTOR]: remote call returned an error: {0}", response.FaultString); |
| 92 | } | 92 | } |
| 93 | else | 93 | else |
| 94 | { | 94 | { |
| @@ -110,22 +110,26 @@ namespace OpenSim.Services.Connectors | |||
| 110 | landData.UserLocation = Vector3.Parse((string)hash["UserLocation"]); | 110 | landData.UserLocation = Vector3.Parse((string)hash["UserLocation"]); |
| 111 | if (hash["RegionAccess"] != null) | 111 | if (hash["RegionAccess"] != null) |
| 112 | regionAccess = (byte)Convert.ToInt32((string)hash["RegionAccess"]); | 112 | regionAccess = (byte)Convert.ToInt32((string)hash["RegionAccess"]); |
| 113 | m_log.DebugFormat("[OGS1 GRID SERVICES] Got land data for parcel {0}", landData.Name); | 113 | m_log.DebugFormat("[LAND CONNECTOR]: Got land data for parcel {0}", landData.Name); |
| 114 | } | 114 | } |
| 115 | catch (Exception e) | 115 | catch (Exception e) |
| 116 | { | 116 | { |
| 117 | m_log.Error("[LAND CONNECTOR] Got exception while parsing land-data:", e); | 117 | m_log.ErrorFormat( |
| 118 | "[LAND CONNECTOR]: Got exception while parsing land-data: {0} {1}", | ||
| 119 | e.Message, e.StackTrace); | ||
| 118 | } | 120 | } |
| 119 | } | 121 | } |
| 120 | } | 122 | } |
| 121 | else m_log.WarnFormat("[LAND CONNECTOR] Couldn't find region with handle {0}", regionHandle); | 123 | else |
| 124 | m_log.WarnFormat("[LAND CONNECTOR]: Couldn't find region with handle {0}", regionHandle); | ||
| 122 | } | 125 | } |
| 123 | catch (Exception e) | 126 | catch (Exception e) |
| 124 | { | 127 | { |
| 125 | m_log.ErrorFormat("[LAND CONNECTOR] Couldn't contact region {0}: {1}", regionHandle, e); | 128 | m_log.ErrorFormat( |
| 129 | "[LAND CONNECTOR]: Couldn't contact region {0}: {1} {2}", regionHandle, e.Message, e.StackTrace); | ||
| 126 | } | 130 | } |
| 127 | 131 | ||
| 128 | return landData; | 132 | return landData; |
| 129 | } | 133 | } |
| 130 | } | 134 | } |
| 131 | } | 135 | } \ No newline at end of file |