*Removed GridInfo class as it has been previously replaced with the much better NetworkServersInfo class

*Got the GridServer in OGS1 to go through with registering the region, but the actual storage of the region isnt working right now.
**After this is fixed, grid mode should work!

1 files changed, 17 insertions, 4 deletions

diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 824a39e..816c9fd 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -217,7 +217,6 @@ namespace OpenSim.Grid.GridServer
         /// <returns>Startup parameters</returns>

         public XmlRpcResponse XmlRpcSimulatorLoginMethod(XmlRpcRequest request)

         {

-            Console.WriteLine("XMLRPC SIMULATOR LOGIN METHOD CALLED");

 

             XmlRpcResponse response = new XmlRpcResponse();

             Hashtable responseData = new Hashtable();

@@ -229,7 +228,6 @@ namespace OpenSim.Grid.GridServer
             Console.WriteLine(requestData.ToString());

             if (requestData.ContainsKey("UUID"))

             {

-                Console.WriteLine("...VIA UUID");

                 TheSim = getRegion(new LLUUID((string)requestData["UUID"]));

                 logToDB((new LLUUID((string)requestData["UUID"])).ToStringHyphenated(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID.");

             }

@@ -248,7 +246,6 @@ namespace OpenSim.Grid.GridServer
             if (TheSim == null)

             {

                 //NEW REGION

-                Console.WriteLine("THIS IS A NEW REGION...ADDING");

                 TheSim = new SimProfileData();

 

                 TheSim.regionRecvKey = config.SimRecvKey;

@@ -277,7 +274,23 @@ namespace OpenSim.Grid.GridServer
                 {

                     try

                     {

-                        Console.WriteLine("ADDED");kvp.Value.AddProfile(TheSim);

+                        DataResponse insertResponse = kvp.Value.AddProfile(TheSim);

+                        switch(insertResponse)

+                        {

+                            case DataResponse.RESPONSE_OK:

+                                Console.WriteLine("New sim creation successful: " + TheSim.regionName);

+                                break;

+                            case DataResponse.RESPONSE_ERROR:

+                                Console.WriteLine("New sim creation failed (Error): " + TheSim.regionName);

+                                break;

+                            case DataResponse.RESPONSE_INVALIDCREDENTIALS:

+                                Console.WriteLine("New sim creation failed (Invalid Credentials): " + TheSim.regionName);

+                                break;

+                            case DataResponse.RESPONSE_AUTHREQUIRED:

+                                Console.WriteLine("New sim creation failed (Authentication Required): " + TheSim.regionName);

+                                break;

+                        }

+                        

                     }

                     catch (Exception)

                     {