Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
commit
e6ee9785fb
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue