diff options
author | Justin Clarke Casey | 2008-10-29 19:57:30 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-10-29 19:57:30 +0000 |
commit | f8c2efbe70d3cef23c6c519397857e1bc5d960fc (patch) | |
tree | 9c7cd7549906fde44b610c381a6bd08d0ae995d3 | |
parent | * Stop the DataSnapShot module trying to call home on shutdown even if it isn... (diff) | |
download | opensim-SC-f8c2efbe70d3cef23c6c519397857e1bc5d960fc.zip opensim-SC-f8c2efbe70d3cef23c6c519397857e1bc5d960fc.tar.gz opensim-SC-f8c2efbe70d3cef23c6c519397857e1bc5d960fc.tar.bz2 opensim-SC-f8c2efbe70d3cef23c6c519397857e1bc5d960fc.tar.xz |
* Instead of putting 0.5.11.00000 if there is no revision, just put 0.5.11 instead
* This is to make things less confusing to users (and maybe a little easier to do future version filtering for grid connections)
* If there's disagreement about this, then please say so (preferably in the opensim-dev mailing list)
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 315ff3c..36f8d2e 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -427,7 +427,7 @@ namespace OpenSim.Framework.Servers | |||
427 | EntriesFile.Close(); | 427 | EntriesFile.Close(); |
428 | } | 428 | } |
429 | 429 | ||
430 | m_version += string.IsNullOrEmpty(buildVersion)? ".00000" : ("." + buildVersion + " ").Substring(0, 6); | 430 | m_version += string.IsNullOrEmpty(buildVersion) ? " " : ("." + buildVersion + " ").Substring(0, 6); |
431 | 431 | ||
432 | // Add operating system information if available | 432 | // Add operating system information if available |
433 | string OSString = ""; | 433 | string OSString = ""; |
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs index 3763dcd..3f934c9 100644 --- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | |||
@@ -337,11 +337,11 @@ namespace OpenSim.Region.DataSnapshot | |||
337 | } | 337 | } |
338 | catch (WebException) | 338 | catch (WebException) |
339 | { | 339 | { |
340 | m_log.Warn("[DATASNAPSHOT] Unable to notify " + url); | 340 | m_log.Warn("[DATASNAPSHOT]: Unable to notify " + url); |
341 | } | 341 | } |
342 | catch (Exception e) | 342 | catch (Exception e) |
343 | { | 343 | { |
344 | m_log.Warn("[DATASNAPSHOT] Ignoring unknown exception " + e.ToString()); | 344 | m_log.Warn("[DATASNAPSHOT]: Ignoring unknown exception " + e.ToString()); |
345 | } | 345 | } |
346 | byte[] response = new byte[1024]; | 346 | byte[] response = new byte[1024]; |
347 | // int n = 0; | 347 | // int n = 0; |
@@ -352,11 +352,11 @@ namespace OpenSim.Region.DataSnapshot | |||
352 | } | 352 | } |
353 | catch (Exception e) | 353 | catch (Exception e) |
354 | { | 354 | { |
355 | m_log.WarnFormat("[DATASNAPSHOT] Unable to decode reply from data service. Ignoring. {0}", e.StackTrace); | 355 | m_log.WarnFormat("[DATASNAPSHOT]: Unable to decode reply from data service. Ignoring. {0}", e.StackTrace); |
356 | } | 356 | } |
357 | // This is not quite working, so... | 357 | // This is not quite working, so... |
358 | // string responseStr = Encoding.UTF8.GetString(response); | 358 | // string responseStr = Encoding.UTF8.GetString(response); |
359 | m_log.Info("[DATASNAPSHOT] data service notified: " + url); | 359 | m_log.Info("[DATASNAPSHOT]: data service notified: " + url); |
360 | } | 360 | } |
361 | 361 | ||
362 | } | 362 | } |