Merge branch '0.6.9-post-fixes' into careminster

author: Melanie 2010-05-31 17:57:48 +0100
committer: Melanie 2010-05-31 17:57:48 +0100
commit: 0526a91206a64cb43be29d61d472a98f5a031b74 (patch)
tree: 061ab41ebe056e48794de5fd296c8af576471c1e /OpenSim/Framework/Servers/VersionInfo.cs
parent: Fix casting in llParcelMediaCommandList so that it actually, you know, works (diff)
parent: Fix a nullref in EventManager caused by RegionReady not setting the scene (diff)
download: opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.zip
opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.tar.gz
opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.tar.bz2
opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index cf417d7..cf3d6fa 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -30,7 +30,7 @@ namespace OpenSim
    public class VersionInfo
    {
        private const string VERSION_NUMBER = "0.6.9CM";
-        private const Flavour VERSION_FLAVOUR = Flavour.Dev;
+        private const Flavour VERSION_FLAVOUR = Flavour.Post_Fixes;
        public enum Flavour
        {
author	Melanie	2010-05-31 17:57:48 +0100
committer	Melanie	2010-05-31 17:57:48 +0100
commit	0526a91206a64cb43be29d61d472a98f5a031b74 (patch)
tree	061ab41ebe056e48794de5fd296c8af576471c1e /OpenSim/Framework/Servers/VersionInfo.cs
parent	Fix casting in llParcelMediaCommandList so that it actually, you know, works (diff)
parent	Fix a nullref in EventManager caused by RegionReady not setting the scene (diff)
download	opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.zip opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.tar.gz opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.tar.bz2 opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.tar.xz

diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs index cf417d7..cf3d6fa 100644 --- a/OpenSim/Framework/Servers/VersionInfo.cs +++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -30,7 +30,7 @@ namespace OpenSim
30	public class VersionInfo	30	public class VersionInfo
31	{	31	{
32	private const string VERSION_NUMBER = "0.6.9CM";	32	private const string VERSION_NUMBER = "0.6.9CM";
33	private const Flavour VERSION_FLAVOUR = Flavour.Dev;	33	private const Flavour VERSION_FLAVOUR = Flavour.Post_Fixes;
34		34
35	public enum Flavour	35	public enum Flavour
36	{	36	{