Grid Servers:

* Sugilite grid server now works with older regions properly (using it on deepgrid for testing) * Sugilite user server still broken with sugilite region server * Reduced the number of compiler warnings to zero Region Servers: * Added debug information to OGS1 Comms to help debug user server connectivity issues.
author: Adam Frisby 2007-07-04 07:45:42 +0000
committer: Adam Frisby 2007-07-04 07:45:42 +0000
commit: 827cccb99c39b7dd3ee0ccc3defb9d88e449db52 (patch)
tree: 32e07c7b2db0f213844fea6e361093f92cc301bf
parent: * More cleaning - Sugilite now only has build errors for "value is never used... (diff)
download: opensim-SC-827cccb99c39b7dd3ee0ccc3defb9d88e449db52.zip
opensim-SC-827cccb99c39b7dd3ee0ccc3defb9d88e449db52.tar.gz
opensim-SC-827cccb99c39b7dd3ee0ccc3defb9d88e449db52.tar.bz2
opensim-SC-827cccb99c39b7dd3ee0ccc3defb9d88e449db52.tar.xz
5 files changed, 75 insertions, 81 deletions
diff --git a/OpenGridServices.sln b/OpenGridServices.sln
index 2343bc0..947dbb2 100644
--- a/OpenGridServices.sln
+++ b/OpenGridServices.sln
@@ -25,72 +25,61 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}"
 EndProject
 Global
-  GlobalSection(SolutionConfigurationPlatforms) = preSolution
+        GlobalSection(SolutionConfigurationPlatforms) = preSolution
-    Debug|Any CPU = Debug|Any CPU
+                Debug|Any CPU = Debug|Any CPU
-    Release|Any CPU = Release|Any CPU
+                Release|Any CPU = Release|Any CPU
-  EndGlobalSection
+        EndGlobalSection
-  GlobalSection(ProjectDependencies) = postSolution
+        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-    ({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+                {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    ({17F7F694-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
+                {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    ({17F7F6BE-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
+                {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    ({6ECC56A9-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})
+                {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    ({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+                {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    ({60FCC3A6-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+                {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    ({60FCC3A6-0000-0000-0000-000000000000}).7 = ({4B7BFD1C-0000-0000-0000-000000000000})
+                {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    ({2FC96F92-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
+                {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    ({2FC96F92-0000-0000-0000-000000000000}).7 = ({586E2916-0000-0000-0000-000000000000})
+                {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-  EndGlobalSection
+                {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-  GlobalSection(ProjectConfigurationPlatforms) = postSolution
+                {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+        EndGlobalSection
-    {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+        GlobalSection(SolutionProperties) = preSolution
-    {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+                HideSolutionNode = FALSE
-    {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+        EndGlobalSection
-    {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-    {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-  EndGlobalSection
-  GlobalSection(SolutionProperties) = preSolution
-    HideSolutionNode = FALSE
-  EndGlobalSection
 EndGlobal
diff --git a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
index 66f3399..38f9fd3 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Framework.Data.MySQL
            {
                database.insertLogRow(serverDaemon, target, methodCall, arguments, priority, logMessage);
            }
-            catch (Exception e)
+            catch
            {
                database.Reconnect();
            }
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index ab478ed..88365a3 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -246,12 +246,12 @@ namespace OpenSim.Framework.Data.MySQL
                retval.gridRecvKey = (string)reader["gridRecvKey"];
                retval.gridSendKey = (string)reader["gridSendKey"];
                retval.reservationCompany = (string)reader["resCompany"];
-                retval.reservationMaxX = (int)reader["resXMax"];
+                retval.reservationMaxX = Convert.ToInt32(reader["resXMax"].ToString());
-                retval.reservationMaxY = (int)reader["resYMax"];
+                retval.reservationMaxY = Convert.ToInt32(reader["resYMax"].ToString());
-                retval.reservationMinX = (int)reader["resXMin"];
+                retval.reservationMinX = Convert.ToInt32(reader["resXMin"].ToString());
-                retval.reservationMinY = (int)reader["resYMin"];
+                retval.reservationMinY = Convert.ToInt32(reader["resYMin"].ToString());
                retval.reservationName = (string)reader["resName"];
-                retval.status = (bool)reader["status"];
+                retval.status = Convert.ToInt32(reader["status"].ToString()) == 1;
                retval.userUUID = new LLUUID((string)reader["userUUID"]);
            }
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 4c60852..1e457b3 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -243,7 +243,7 @@ namespace OpenSim.Grid.GridServer
                return response;
            }
-            if (TheSim == null)
+            if (TheSim == null) // Shouldnt this be in the REST Simulator Set method?
            {
                //NEW REGION
                TheSim = new SimProfileData();
@@ -279,21 +279,21 @@ namespace OpenSim.Grid.GridServer
                        switch(insertResponse)
                        {
                            case DataResponse.RESPONSE_OK:
-                                Console.WriteLine("New sim creation successful: " + TheSim.regionName);
+                                OpenSim.Framework.Console.MainLog.Instance.Verbose("New sim creation successful: " + TheSim.regionName);
                                break;
                            case DataResponse.RESPONSE_ERROR:
-                                Console.WriteLine("New sim creation failed (Error): " + TheSim.regionName);
+                                OpenSim.Framework.Console.MainLog.Instance.Warn("New sim creation failed (Error): " + TheSim.regionName);
                                break;
                            case DataResponse.RESPONSE_INVALIDCREDENTIALS:
-                                Console.WriteLine("New sim creation failed (Invalid Credentials): " + TheSim.regionName);
+                                OpenSim.Framework.Console.MainLog.Instance.Warn("New sim creation failed (Invalid Credentials): " + TheSim.regionName);
                                break;
                            case DataResponse.RESPONSE_AUTHREQUIRED:
-                                Console.WriteLine("New sim creation failed (Authentication Required): " + TheSim.regionName);
+                                OpenSim.Framework.Console.MainLog.Instance.Warn("New sim creation failed (Authentication Required): " + TheSim.regionName);
                                break;
                        }
                        
                    }
-                    catch (Exception)
+                    catch (Exception e)
                    {
                        OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to add region " + TheSim.UUID.ToStringHyphenated() + " via " + kvp.Key);
                    }
@@ -541,7 +541,7 @@ namespace OpenSim.Grid.GridServer
        /// <returns>"OK" or an error</returns>
        public string RestSetSimMethod(string request, string path, string param)
        {
-            Console.WriteLine("Processing region update");
+            Console.WriteLine("Processing region update via REST method");
            SimProfileData TheSim;
            TheSim = getRegion(new LLUUID(param));
            if ((TheSim) == null)
@@ -569,6 +569,7 @@ namespace OpenSim.Grid.GridServer
            if (authkeynode.InnerText != TheSim.regionRecvKey)
            {
+                MainLog.Instance.Warn("Invalid Key Attempt on region update");
                return "ERROR! invalid key";
            }
@@ -640,6 +641,7 @@ namespace OpenSim.Grid.GridServer
                        }
                        else
                        {
+                            MainLog.Instance.Warn("Unable to update region (RestSetSimMethod): Incorrect reservation auth key.");// Wanted: " + reserveData.gridRecvKey + ", Got: " + TheSim.regionRecvKey + ".");
                            return "Unable to update region (RestSetSimMethod): Incorrect auth key.";
                        }
                    }
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index a11995a..99e9c96 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -64,6 +64,7 @@ namespace OpenSim.Region.Communications.OGS1
            if (!this.listeners.ContainsKey(regionInfo.RegionHandle))
            {
+                MainLog.Instance.Verbose("OGS1 - Registering new HTTP listener on port " + regionInfo.InternalEndPoint.Port.ToString());
               // initialised = true;
                httpListener = new BaseHttpServer( regionInfo.InternalEndPoint.Port );
                httpListener.AddXmlRPCHandler("expect_user", this.ExpectUser);
@@ -193,6 +194,8 @@ namespace OpenSim.Region.Communications.OGS1
                MainLog.Instance.Error("ExpectUser() - Unknown region " + ((ulong)requestData["regionhandle"]).ToString());
            }
+            MainLog.Instance.Verbose("ExpectUser() - Welcoming new user...");
            return new XmlRpcResponse();
        }
author	Adam Frisby	2007-07-04 07:45:42 +0000
committer	Adam Frisby	2007-07-04 07:45:42 +0000
commit	827cccb99c39b7dd3ee0ccc3defb9d88e449db52 (patch)
tree	32e07c7b2db0f213844fea6e361093f92cc301bf
parent	* More cleaning - Sugilite now only has build errors for "value is never used... (diff)
download	opensim-SC-827cccb99c39b7dd3ee0ccc3defb9d88e449db52.zip opensim-SC-827cccb99c39b7dd3ee0ccc3defb9d88e449db52.tar.gz opensim-SC-827cccb99c39b7dd3ee0ccc3defb9d88e449db52.tar.bz2 opensim-SC-827cccb99c39b7dd3ee0ccc3defb9d88e449db52.tar.xz

diff --git a/OpenGridServices.sln b/OpenGridServices.sln index 2343bc0..947dbb2 100644 --- a/OpenGridServices.sln +++ b/OpenGridServices.sln
@@ -25,72 +25,61 @@ EndProject
25	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}"	25	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}"
26	EndProject	26	EndProject
27	Global	27	Global
28	GlobalSection(SolutionConfigurationPlatforms) = preSolution	28	GlobalSection(SolutionConfigurationPlatforms) = preSolution
29	Debug\|Any CPU = Debug\|Any CPU	29	Debug\|Any CPU = Debug\|Any CPU
30	Release\|Any CPU = Release\|Any CPU	30	Release\|Any CPU = Release\|Any CPU
31	EndGlobalSection	31	EndGlobalSection
32	GlobalSection(ProjectDependencies) = postSolution	32	GlobalSection(ProjectConfigurationPlatforms) = postSolution
33	({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})	33	{36B72A9B-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
34	({17F7F694-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})	34	{36B72A9B-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
35	({17F7F6BE-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})	35	{36B72A9B-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
36	({6ECC56A9-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000})	36	{36B72A9B-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
37	({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})	37	{FD2D303D-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
38	({60FCC3A6-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})	38	{FD2D303D-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
39	({60FCC3A6-0000-0000-0000-000000000000}).7 = ({4B7BFD1C-0000-0000-0000-000000000000})	39	{FD2D303D-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
40	({2FC96F92-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})	40	{FD2D303D-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
41	({2FC96F92-0000-0000-0000-000000000000}).7 = ({586E2916-0000-0000-0000-000000000000})	41	{17F7F694-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
42	EndGlobalSection	42	{17F7F694-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
43	GlobalSection(ProjectConfigurationPlatforms) = postSolution	43	{17F7F694-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
44	{36B72A9B-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	44	{17F7F694-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
45	{36B72A9B-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	45	{17F7F6BE-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
46	{36B72A9B-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	46	{17F7F6BE-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
47	{36B72A9B-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	47	{17F7F6BE-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
48	{FD2D303D-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	48	{17F7F6BE-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
49	{FD2D303D-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	49	{6ECC56A9-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
50	{FD2D303D-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	50	{6ECC56A9-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
51	{FD2D303D-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	51	{6ECC56A9-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
52	{17F7F694-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	52	{6ECC56A9-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
53	{17F7F694-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	53	{586E2916-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
54	{17F7F694-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	54	{586E2916-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
55	{17F7F694-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	55	{586E2916-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
56	{17F7F6BE-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	56	{586E2916-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
57	{17F7F6BE-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	57	{E5F1A03B-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
58	{17F7F6BE-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	58	{E5F1A03B-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
59	{17F7F6BE-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	59	{E5F1A03B-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
60	{6ECC56A9-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	60	{E5F1A03B-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
61	{6ECC56A9-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	61	{4B7BFD1C-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
62	{6ECC56A9-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	62	{4B7BFD1C-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
63	{6ECC56A9-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	63	{4B7BFD1C-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
64	{586E2916-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	64	{4B7BFD1C-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
65	{586E2916-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	65	{60FCC3A6-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
66	{586E2916-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	66	{60FCC3A6-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
67	{586E2916-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	67	{60FCC3A6-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
68	{E5F1A03B-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	68	{60FCC3A6-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
69	{E5F1A03B-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	69	{1442B635-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
70	{E5F1A03B-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	70	{1442B635-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
71	{E5F1A03B-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	71	{1442B635-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
72	{4B7BFD1C-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	72	{1442B635-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
73	{4B7BFD1C-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	73	{2FC96F92-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
74	{4B7BFD1C-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	74	{2FC96F92-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
75	{4B7BFD1C-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	75	{2FC96F92-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
76	{60FCC3A6-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	76	{2FC96F92-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
77	{60FCC3A6-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	77	{08F87229-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
78	{60FCC3A6-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	78	{08F87229-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
79	{60FCC3A6-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	79	{08F87229-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
80	{1442B635-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	80	{08F87229-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
81	{1442B635-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	81	EndGlobalSection
82	{1442B635-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	82	GlobalSection(SolutionProperties) = preSolution
83	{1442B635-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU	83	HideSolutionNode = FALSE
84	{2FC96F92-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	84	EndGlobalSection
85	{2FC96F92-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
86	{2FC96F92-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
87	{2FC96F92-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
88	{08F87229-0000-0000-0000-000000000000}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
89	{08F87229-0000-0000-0000-000000000000}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
90	{08F87229-0000-0000-0000-000000000000}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
91	{08F87229-0000-0000-0000-000000000000}.Release\|Any CPU.Build.0 = Release\|Any CPU
92	EndGlobalSection
93	GlobalSection(SolutionProperties) = preSolution
94	HideSolutionNode = FALSE
95	EndGlobalSection
96	EndGlobal	85	EndGlobal


diff --git a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs index 66f3399..38f9fd3 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Framework.Data.MySQL
70	{	70	{
71	database.insertLogRow(serverDaemon, target, methodCall, arguments, priority, logMessage);	71	database.insertLogRow(serverDaemon, target, methodCall, arguments, priority, logMessage);
72	}	72	}
73	catch (Exception e)	73	catch
74	{	74	{
75	database.Reconnect();	75	database.Reconnect();
76	}	76	}


diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs index ab478ed..88365a3 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -246,12 +246,12 @@ namespace OpenSim.Framework.Data.MySQL
246	retval.gridRecvKey = (string)reader["gridRecvKey"];	246	retval.gridRecvKey = (string)reader["gridRecvKey"];
247	retval.gridSendKey = (string)reader["gridSendKey"];	247	retval.gridSendKey = (string)reader["gridSendKey"];
248	retval.reservationCompany = (string)reader["resCompany"];	248	retval.reservationCompany = (string)reader["resCompany"];
249	retval.reservationMaxX = (int)reader["resXMax"];	249	retval.reservationMaxX = Convert.ToInt32(reader["resXMax"].ToString());
250	retval.reservationMaxY = (int)reader["resYMax"];	250	retval.reservationMaxY = Convert.ToInt32(reader["resYMax"].ToString());
251	retval.reservationMinX = (int)reader["resXMin"];	251	retval.reservationMinX = Convert.ToInt32(reader["resXMin"].ToString());
252	retval.reservationMinY = (int)reader["resYMin"];	252	retval.reservationMinY = Convert.ToInt32(reader["resYMin"].ToString());
253	retval.reservationName = (string)reader["resName"];	253	retval.reservationName = (string)reader["resName"];
254	retval.status = (bool)reader["status"];	254	retval.status = Convert.ToInt32(reader["status"].ToString()) == 1;
255	retval.userUUID = new LLUUID((string)reader["userUUID"]);	255	retval.userUUID = new LLUUID((string)reader["userUUID"]);
256		256
257	}	257	}


diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 4c60852..1e457b3 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -243,7 +243,7 @@ namespace OpenSim.Grid.GridServer
243	return response;	243	return response;
244	}	244	}
245		245
246	if (TheSim == null)	246	if (TheSim == null) // Shouldnt this be in the REST Simulator Set method?
247	{	247	{
248	//NEW REGION	248	//NEW REGION
249	TheSim = new SimProfileData();	249	TheSim = new SimProfileData();
@@ -279,21 +279,21 @@ namespace OpenSim.Grid.GridServer
279	switch(insertResponse)	279	switch(insertResponse)
280	{	280	{
281	case DataResponse.RESPONSE_OK:	281	case DataResponse.RESPONSE_OK:
282	Console.WriteLine("New sim creation successful: " + TheSim.regionName);	282	OpenSim.Framework.Console.MainLog.Instance.Verbose("New sim creation successful: " + TheSim.regionName);
283	break;	283	break;
284	case DataResponse.RESPONSE_ERROR:	284	case DataResponse.RESPONSE_ERROR:
285	Console.WriteLine("New sim creation failed (Error): " + TheSim.regionName);	285	OpenSim.Framework.Console.MainLog.Instance.Warn("New sim creation failed (Error): " + TheSim.regionName);
286	break;	286	break;
287	case DataResponse.RESPONSE_INVALIDCREDENTIALS:	287	case DataResponse.RESPONSE_INVALIDCREDENTIALS:
288	Console.WriteLine("New sim creation failed (Invalid Credentials): " + TheSim.regionName);	288	OpenSim.Framework.Console.MainLog.Instance.Warn("New sim creation failed (Invalid Credentials): " + TheSim.regionName);
289	break;	289	break;
290	case DataResponse.RESPONSE_AUTHREQUIRED:	290	case DataResponse.RESPONSE_AUTHREQUIRED:
291	Console.WriteLine("New sim creation failed (Authentication Required): " + TheSim.regionName);	291	OpenSim.Framework.Console.MainLog.Instance.Warn("New sim creation failed (Authentication Required): " + TheSim.regionName);
292	break;	292	break;
293	}	293	}
294		294
295	}	295	}
296	catch (Exception)	296	catch (Exception e)
297	{	297	{
298	OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to add region " + TheSim.UUID.ToStringHyphenated() + " via " + kvp.Key);	298	OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to add region " + TheSim.UUID.ToStringHyphenated() + " via " + kvp.Key);
299	}	299	}
@@ -541,7 +541,7 @@ namespace OpenSim.Grid.GridServer
541	/// <returns>"OK" or an error</returns>	541	/// <returns>"OK" or an error</returns>
542	public string RestSetSimMethod(string request, string path, string param)	542	public string RestSetSimMethod(string request, string path, string param)
543	{	543	{
544	Console.WriteLine("Processing region update");	544	Console.WriteLine("Processing region update via REST method");
545	SimProfileData TheSim;	545	SimProfileData TheSim;
546	TheSim = getRegion(new LLUUID(param));	546	TheSim = getRegion(new LLUUID(param));
547	if ((TheSim) == null)	547	if ((TheSim) == null)
@@ -569,6 +569,7 @@ namespace OpenSim.Grid.GridServer
569		569
570	if (authkeynode.InnerText != TheSim.regionRecvKey)	570	if (authkeynode.InnerText != TheSim.regionRecvKey)
571	{	571	{
		572	MainLog.Instance.Warn("Invalid Key Attempt on region update");
572	return "ERROR! invalid key";	573	return "ERROR! invalid key";
573	}	574	}
574		575
@@ -640,6 +641,7 @@ namespace OpenSim.Grid.GridServer
640	}	641	}
641	else	642	else
642	{	643	{
		644	MainLog.Instance.Warn("Unable to update region (RestSetSimMethod): Incorrect reservation auth key.");// Wanted: " + reserveData.gridRecvKey + ", Got: " + TheSim.regionRecvKey + ".");
643	return "Unable to update region (RestSetSimMethod): Incorrect auth key.";	645	return "Unable to update region (RestSetSimMethod): Incorrect auth key.";
644	}	646	}
645	}	647	}


diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index a11995a..99e9c96 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -64,6 +64,7 @@ namespace OpenSim.Region.Communications.OGS1
64		64
65	if (!this.listeners.ContainsKey(regionInfo.RegionHandle))	65	if (!this.listeners.ContainsKey(regionInfo.RegionHandle))
66	{	66	{
		67	MainLog.Instance.Verbose("OGS1 - Registering new HTTP listener on port " + regionInfo.InternalEndPoint.Port.ToString());
67	// initialised = true;	68	// initialised = true;
68	httpListener = new BaseHttpServer( regionInfo.InternalEndPoint.Port );	69	httpListener = new BaseHttpServer( regionInfo.InternalEndPoint.Port );
69	httpListener.AddXmlRPCHandler("expect_user", this.ExpectUser);	70	httpListener.AddXmlRPCHandler("expect_user", this.ExpectUser);
@@ -193,6 +194,8 @@ namespace OpenSim.Region.Communications.OGS1
193	MainLog.Instance.Error("ExpectUser() - Unknown region " + ((ulong)requestData["regionhandle"]).ToString());	194	MainLog.Instance.Error("ExpectUser() - Unknown region " + ((ulong)requestData["regionhandle"]).ToString());
194	}	195	}
195		196
		197	MainLog.Instance.Verbose("ExpectUser() - Welcoming new user...");
		198
196	return new XmlRpcResponse();	199	return new XmlRpcResponse();
197	}	200	}
198		201