brought zircon branch into trunk

2 files changed, 26 insertions, 15 deletions

diff --git a/src/VersionInfo.cs.template b/OpenSim.Framework.Console/MainConsole.cs
index e4e1b95..02c4ae8 100644
--- a/src/VersionInfo.cs.template
+++ b/OpenSim.Framework.Console/MainConsole.cs
@@ -1,5 +1,5 @@
 /*

-Copyright (c) OpenSim project, http://osgrid.org/

+* Copyright (c) OpenSim project, http://sim.opensecondlife.org/

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:

@@ -22,16 +22,27 @@ Copyright (c) OpenSim project, http://osgrid.org/
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+* 

 */

-

 using System;

 

-namespace OpenSim

+namespace OpenSim.Framework.Console

 {

-        /// <summary>

-        /// </summary>

-        public class VersionInfo

-        {

-                public static string Version = "@@VERSION"; 

-        }

+        public class MainConsole {

+                

+                private static ConsoleBase instance;

+                

+                public static ConsoleBase Instance 

+                {

+                        get 

+                        {

+                                return instance;

+                        }

+                        set

+                        {

+                                instance = value;

+                        }

+                }

+    }

+

 }

diff --git a/src/VersionInfo.cs b/OpenSim.RegionServer/VersionInfo.cs
index 5cfd136..39767df 100644
--- a/src/VersionInfo.cs
+++ b/OpenSim.RegionServer/VersionInfo.cs
@@ -28,10 +28,10 @@ using System;
 

 namespace OpenSim

 {

-        /// <summary>

-        /// </summary>

-        public class VersionInfo

-        {

-                public static string Version = "0.1, Build 1174381410, Revision 240M"; 

-        }

+    /// <summary>

+    /// </summary>

+    public class VersionInfo

+    {

+        public static string Version = "0.1, Build 1173843165, Revision 193:206M";

+    }

 }