diff options
| author | Melanie | 2009-10-05 10:17:23 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-05 10:17:23 +0100 |
| commit | 0744292b479446eb1ebec828afafacc0189709ca (patch) | |
| tree | 3c43b5f425aff61d3625b75b7aef35ce5062ae56 /OpenSim/Region/DataSnapshot | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Make the asset connector async Get overload return false if the asset (diff) | |
| download | opensim-SC_OLD-0744292b479446eb1ebec828afafacc0189709ca.zip opensim-SC_OLD-0744292b479446eb1ebec828afafacc0189709ca.tar.gz opensim-SC_OLD-0744292b479446eb1ebec828afafacc0189709ca.tar.bz2 opensim-SC_OLD-0744292b479446eb1ebec828afafacc0189709ca.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs index 080bd5a..4df9094 100644 --- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | |||
| @@ -352,7 +352,7 @@ namespace OpenSim.Region.DataSnapshot | |||
| 352 | m_log.WarnFormat("[DATASNAPSHOT]: Unable to decode reply from data service. Ignoring. {0}", e.StackTrace); | 352 | m_log.WarnFormat("[DATASNAPSHOT]: Unable to decode reply from data service. Ignoring. {0}", e.StackTrace); |
| 353 | } | 353 | } |
| 354 | // This is not quite working, so... | 354 | // This is not quite working, so... |
| 355 | // string responseStr = Encoding.UTF8.GetString(response); | 355 | // string responseStr = Util.UTF8.GetString(response); |
| 356 | m_log.Info("[DATASNAPSHOT]: data service notified: " + url); | 356 | m_log.Info("[DATASNAPSHOT]: data service notified: " + url); |
| 357 | } | 357 | } |
| 358 | 358 | ||