OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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)
0.6.0-stable
Justin Clarke Casey 2008-10-29 19:57:30 +00:00
parent b21734d4d9
commit f8c2efbe70
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Servers/BaseOpenSimServer.cs
View File

@ -427,7 +427,7 @@ namespace OpenSim.Framework.Servers
EntriesFile.Close(); EntriesFile.Close();
} }
m_version += string.IsNullOrEmpty(buildVersion)? ".00000" : ("." + buildVersion + " ").Substring(0, 6); m_version += string.IsNullOrEmpty(buildVersion) ? " " : ("." + buildVersion + " ").Substring(0, 6);
// Add operating system information if available // Add operating system information if available
string OSString = ""; string OSString = "";

8
OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
View File

@ -337,11 +337,11 @@ namespace OpenSim.Region.DataSnapshot
} }
catch (WebException) catch (WebException)
{ {
m_log.Warn("[DATASNAPSHOT] Unable to notify " + url); m_log.Warn("[DATASNAPSHOT]: Unable to notify " + url);
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Warn("[DATASNAPSHOT] Ignoring unknown exception " + e.ToString()); m_log.Warn("[DATASNAPSHOT]: Ignoring unknown exception " + e.ToString());
} }
byte[] response = new byte[1024]; byte[] response = new byte[1024];
// int n = 0; // int n = 0;
@ -352,11 +352,11 @@ namespace OpenSim.Region.DataSnapshot
} }
catch (Exception e) catch (Exception e)
{ {
m_log.WarnFormat("[DATASNAPSHOT] Unable to decode reply from data service. Ignoring. {0}", e.StackTrace); m_log.WarnFormat("[DATASNAPSHOT]: Unable to decode reply from data service. Ignoring. {0}", e.StackTrace);
} }
// This is not quite working, so... // This is not quite working, so...
// string responseStr = Encoding.UTF8.GetString(response); // string responseStr = Encoding.UTF8.GetString(response);
m_log.Info("[DATASNAPSHOT] data service notified: " + url); m_log.Info("[DATASNAPSHOT]: data service notified: " + url);
} }
} }