Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

0.6.8-post-fixes
Diva Canto 2009-09-28 15:48:26 -07:00
commit e6ee9785fb
2 changed files with 2 additions and 2 deletions

View File

@ -29,7 +29,7 @@ namespace OpenSim
{ {
public class VersionInfo public class VersionInfo
{ {
private const string VERSION_NUMBER = "0.6.6"; private const string VERSION_NUMBER = "0.6.8";
private const Flavour VERSION_FLAVOUR = Flavour.Dev; private const Flavour VERSION_FLAVOUR = Flavour.Dev;
public enum Flavour public enum Flavour

View File

@ -443,7 +443,7 @@ namespace OpenSim.Server.Handlers.Grid
doc.WriteTo(xw); doc.WriteTo(xw);
xw.Flush(); xw.Flush();
return ms.GetBuffer(); return ms.ToArray();
} }
#endregion #endregion