aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-09-28 15:48:26 -0700
committerDiva Canto2009-09-28 15:48:26 -0700
commite6ee9785fbd22e8c930f9d5189d023c2b941c109 (patch)
tree2d1db0834050079df85df43f2c2df76c059dff37
parentForgot a return statement. (diff)
parentBump main version to 0.6.8-Dev (diff)
downloadopensim-SC_OLD-e6ee9785fbd22e8c930f9d5189d023c2b941c109.zip
opensim-SC_OLD-e6ee9785fbd22e8c930f9d5189d023c2b941c109.tar.gz
opensim-SC_OLD-e6ee9785fbd22e8c930f9d5189d023c2b941c109.tar.bz2
opensim-SC_OLD-e6ee9785fbd22e8c930f9d5189d023c2b941c109.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Framework/Servers/VersionInfo.cs2
-rw-r--r--OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index 6f9b00c..d06adb5 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -29,7 +29,7 @@ namespace OpenSim
29{ 29{
30 public class VersionInfo 30 public class VersionInfo
31 { 31 {
32 private const string VERSION_NUMBER = "0.6.6"; 32 private const string VERSION_NUMBER = "0.6.8";
33 private const Flavour VERSION_FLAVOUR = Flavour.Dev; 33 private const Flavour VERSION_FLAVOUR = Flavour.Dev;
34 34
35 public enum Flavour 35 public enum Flavour
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
index e751365..e22328d 100644
--- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
@@ -443,7 +443,7 @@ namespace OpenSim.Server.Handlers.Grid
443 doc.WriteTo(xw); 443 doc.WriteTo(xw);
444 xw.Flush(); 444 xw.Flush();
445 445
446 return ms.GetBuffer(); 446 return ms.ToArray();
447 } 447 }
448 448
449 #endregion 449 #endregion