From 9c294c566313c4d2a97d519b9efd08c7ca0f43db Mon Sep 17 00:00:00 2001
From: dr scofield (aka dirk husemann)
Date: Wed, 23 Dec 2009 18:33:54 +0100
Subject: - commented out unused method ConvertIHttpClientContextToOSHttp

---
 OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Framework/Servers')

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 08f1bec..857c584 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -322,15 +322,15 @@ namespace OpenSim.Framework.Servers.HttpServer
             HandleRequest(req, resp);
         }
 
-        public void ConvertIHttpClientContextToOSHttp(object stateinfo)
-        {
-            HttpServerContextObj objstate = (HttpServerContextObj)stateinfo;
+        // public void ConvertIHttpClientContextToOSHttp(object stateinfo)
+        // {
+        //     HttpServerContextObj objstate = (HttpServerContextObj)stateinfo;
 
-            OSHttpRequest request = objstate.oreq;
-            OSHttpResponse resp = objstate.oresp;
+        //     OSHttpRequest request = objstate.oreq;
+        //     OSHttpResponse resp = objstate.oresp;
 
-            HandleRequest(request,resp);
-        }
+        //     HandleRequest(request,resp);
+        // }
 
         public virtual void HandleRequest(OSHttpRequest request, OSHttpResponse response)
         {
-- 
cgit v1.1


From e7439efc74a1cc0daedc51eb25ae66cd03db70b5 Mon Sep 17 00:00:00 2001
From: Kitto Flora
Date: Thu, 24 Dec 2009 19:19:44 -0500
Subject: Recover out-of-region objects during db load.

---
 OpenSim/Framework/Servers/VersionInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework/Servers')

diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index a7d34f5..7274a06 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -29,7 +29,7 @@ namespace OpenSim
 {
     public class VersionInfo
     {
-        private const string VERSION_NUMBER = "0.6.91CM";
+        private const string VERSION_NUMBER = "0.6.92Ch";
         private const Flavour VERSION_FLAVOUR = Flavour.Dev;
         public enum Flavour
         {
-- 
cgit v1.1


From b19e5643171d9a081426026c0e96c84c3e7f97b2 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 25 Dec 2009 23:20:30 +0000
Subject: Restore version suffix.

---
 OpenSim/Framework/Servers/VersionInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework/Servers')

diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index 7274a06..4844a66 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -29,7 +29,7 @@ namespace OpenSim
 {
     public class VersionInfo
     {
-        private const string VERSION_NUMBER = "0.6.92Ch";
+        private const string VERSION_NUMBER = "0.6.92CM";
         private const Flavour VERSION_FLAVOUR = Flavour.Dev;
         public enum Flavour
         {
-- 
cgit v1.1


From 59f683066a60a99111cc032ee122dfe709c78440 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 25 Dec 2009 23:23:49 +0000
Subject: Set version back to core version (base) and suffix CM. Please DO NOT
 CHANGE THIS in the repo. This is the Caremninster repo and the number follows
 CORE. Always.

---
 OpenSim/Framework/Servers/VersionInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Framework/Servers')

diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index 4844a66..f618047 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -29,7 +29,7 @@ namespace OpenSim
 {
     public class VersionInfo
     {
-        private const string VERSION_NUMBER = "0.6.92CM";
+        private const string VERSION_NUMBER = "0.6.8CM";
         private const Flavour VERSION_FLAVOUR = Flavour.Dev;
         public enum Flavour
         {
-- 
cgit v1.1