8 files changed, 40 insertions, 15 deletions

diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
index cf54fa4..2f0727f 100644
--- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
+++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
@@ -95,11 +95,13 @@ namespace OpenSim.Framework.Communications.Cache
                 //  RestClient rc = new RestClient(_assetServerUrl);
                 MainLog.Instance.Verbose("ASSET", "Storing asset");
                 //rc.AddResourcePath("assets");
+
                 // rc.RequestMethod = "POST";
                 //  rc.Request(s);
                 //MainLog.Instance.Verbose("ASSET", "Stored {0}", rc);
                 MainLog.Instance.Verbose("ASSET", "Sending to " + _assetServerUrl + "/assets/");
                 RestObjectPoster.BeginPostObject<AssetBase>(_assetServerUrl + "/assets/", asset);
+
             }
             catch (Exception e)
             {
diff --git a/OpenSim/Framework/Communications/RestClient/RestClient.cs b/OpenSim/Framework/Communications/RestClient/RestClient.cs
index e4da4dc..76bad64 100644
--- a/OpenSim/Framework/Communications/RestClient/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient/RestClient.cs
@@ -389,6 +389,7 @@ namespace OpenSim.Framework.Communications
                 dst.Write(buf, 0, length);
                 length = src.Read(buf, 0, 1024);
             }
+
             _response = (HttpWebResponse) _request.GetResponse();
 
 //            IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request);
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs b/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs
index 275ce47..5d636bd 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs
@@ -1,10 +1,11 @@
 using System.Data.Common;
 using MySql.Data.MySqlClient;
-// using TribalMedia.Framework.Data;
+ //using TribalMedia.Framework.Data;
+
 
-/*
 namespace OpenSim.Framework.Data.MySQL
 {
+    /*
     public class MySQLDatabaseMapper : OpenSimDatabaseConnector
     {
         public MySQLDatabaseMapper(string connectionString)
@@ -22,6 +23,6 @@ namespace OpenSim.Framework.Data.MySQL
         {
             return "?" + fieldName;
         }
-    }
+    }*/
 }
-*/
+
diff --git a/OpenSim/Framework/Data/OpenSimDataReader.cs b/OpenSim/Framework/Data/OpenSimDataReader.cs
index c7b6470..d113f14 100644
--- a/OpenSim/Framework/Data/OpenSimDataReader.cs
+++ b/OpenSim/Framework/Data/OpenSimDataReader.cs
@@ -4,7 +4,7 @@ using System.Data;
 using System.Text;
 using libsecondlife;
 
-/*
+
 using TribalMedia.Framework.Data;
 
 namespace OpenSim.Framework.Data
@@ -39,4 +39,4 @@ namespace OpenSim.Framework.Data
         }
     }
 }
-*/
+
diff --git a/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs b/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs
index 155bdc1..aba9329 100644
--- a/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs
+++ b/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs
@@ -1,6 +1,8 @@
 using System.Data;
+using System.Data.Common;
 using libsecondlife;
-/*
+using MySql.Data.MySqlClient;
+
 using TribalMedia.Framework.Data;
 
 namespace OpenSim.Framework.Data
@@ -26,5 +28,25 @@ namespace OpenSim.Framework.Data
             return new OpenSimDataReader(reader);
         }
     }
+
+
+    public class MySQLDatabaseMapper : OpenSimDatabaseConnector
+    {
+        public MySQLDatabaseMapper(string connectionString)
+            : base(connectionString)
+        {
+        }
+
+        public override DbConnection GetNewConnection()
+        {
+            MySqlConnection connection = new MySqlConnection(m_connectionString);
+            return connection;
+        }
+
+        public override string CreateParamName(string fieldName)
+        {
+            return "?" + fieldName;
+        }
+    }
 }
-*/
+
diff --git a/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs b/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs
index 8d5b9cf..269f863 100644
--- a/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs
+++ b/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Data.Common;
 using System.Text;
 using libsecondlife;
-/*
+
 using TribalMedia.Framework.Data;
 
 namespace OpenSim.Framework.Data
@@ -73,4 +73,4 @@ namespace OpenSim.Framework.Data
         }      
     }
 }
-*/
+
diff --git a/OpenSim/Framework/Data/OpenSimTableMapper.cs b/OpenSim/Framework/Data/OpenSimTableMapper.cs
index f596b45..e5deae0 100644
--- a/OpenSim/Framework/Data/OpenSimTableMapper.cs
+++ b/OpenSim/Framework/Data/OpenSimTableMapper.cs
@@ -1,5 +1,5 @@
 using System.Data;
-/*
+
 using TribalMedia.Framework.Data;
 
 namespace OpenSim.Framework.Data
@@ -11,4 +11,3 @@ namespace OpenSim.Framework.Data
         }
     }
 }
-*/
diff --git a/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs b/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs
index 227a98e..ec9689a 100644
--- a/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs
+++ b/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs
@@ -1,9 +1,9 @@
 using System;
 using OpenSim.Framework;
-//using TribalMedia.Framework.Data;
+using TribalMedia.Framework.Data;
 using libsecondlife;
 
-/*
+
 namespace OpenSim.Framework.Data
 {
     public class PrimitiveBaseShapeRowMapper : BaseRowMapper<PrimitiveBaseShape>
@@ -142,4 +142,4 @@ namespace OpenSim.Framework.Data
         }
     }
 }
-*/
+