14 files changed, 41 insertions, 2 deletions

diff --git a/Common/OpenSim.Framework/Types/AgentCiruitData.cs b/OpenSim/Framework/General/Types/AgentCiruitData.cs
index a650343..a650343 100644
--- a/Common/OpenSim.Framework/Types/AgentCiruitData.cs
+++ b/OpenSim/Framework/General/Types/AgentCiruitData.cs
diff --git a/Common/OpenSim.Framework/Types/AgentWearable.cs b/OpenSim/Framework/General/Types/AgentWearable.cs
index 4c93da7..4c93da7 100644
--- a/Common/OpenSim.Framework/Types/AgentWearable.cs
+++ b/OpenSim/Framework/General/Types/AgentWearable.cs
diff --git a/Common/OpenSim.Framework/Types/AssetBase.cs b/OpenSim/Framework/General/Types/AssetBase.cs
index 86586a6..86586a6 100644
--- a/Common/OpenSim.Framework/Types/AssetBase.cs
+++ b/OpenSim/Framework/General/Types/AssetBase.cs
diff --git a/Common/OpenSim.Framework/Types/AssetLandmark.cs b/OpenSim/Framework/General/Types/AssetLandmark.cs
index 8a10b70..8a10b70 100644
--- a/Common/OpenSim.Framework/Types/AssetLandmark.cs
+++ b/OpenSim/Framework/General/Types/AssetLandmark.cs
diff --git a/Common/OpenSim.Framework/Types/AssetStorage.cs b/OpenSim/Framework/General/Types/AssetStorage.cs
index 8cac23a..8cac23a 100644
--- a/Common/OpenSim.Framework/Types/AssetStorage.cs
+++ b/OpenSim/Framework/General/Types/AssetStorage.cs
diff --git a/Common/OpenSim.Framework/Types/EstateSettings.cs b/OpenSim/Framework/General/Types/EstateSettings.cs
index 778c893..778c893 100644
--- a/Common/OpenSim.Framework/Types/EstateSettings.cs
+++ b/OpenSim/Framework/General/Types/EstateSettings.cs
diff --git a/Common/OpenSim.Framework/Types/Login.cs b/OpenSim/Framework/General/Types/Login.cs
index 3180a16..3180a16 100644
--- a/Common/OpenSim.Framework/Types/Login.cs
+++ b/OpenSim/Framework/General/Types/Login.cs
diff --git a/Common/OpenSim.Framework/Types/MapBlockData.cs b/OpenSim/Framework/General/Types/MapBlockData.cs
index 2e6f56e..2e6f56e 100644
--- a/Common/OpenSim.Framework/Types/MapBlockData.cs
+++ b/OpenSim/Framework/General/Types/MapBlockData.cs
diff --git a/Common/OpenSim.Framework/Types/NeighbourInfo.cs b/OpenSim/Framework/General/Types/NeighbourInfo.cs
index 310fd1c..310fd1c 100644
--- a/Common/OpenSim.Framework/Types/NeighbourInfo.cs
+++ b/OpenSim/Framework/General/Types/NeighbourInfo.cs
diff --git a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
index 73d7811..c6b81a7 100644
--- a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
@@ -156,6 +156,45 @@ namespace OpenSim.Framework.Types
                         this.GridRecvKey = attri;

                     }

 

+                    //Grid Server 

+                    attri = "";

+                    attri = configData.GetAttribute("UserServerURL");

+                    if (attri == "")

+                    {

+                        this.UserURL= OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("User server URL", "http://127.0.0.1:8002/");

+                        configData.SetAttribute("UserServerURL", this.UserURL);

+                    }

+                    else

+                    {

+                        this.UserURL = attri;

+                    }

+

+                    //Grid Send Key

+                    attri = "";

+                    attri = configData.GetAttribute("UserSendKey");

+                    if (attri == "")

+                    {

+                        this.UserSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to user server", "null");

+                        configData.SetAttribute("UserSendKey", this.UserSendKey);

+                    }

+                    else

+                    {

+                        this.UserSendKey = attri;

+                    }

+

+                    //Grid Receive Key

+                    attri = "";

+                    attri = configData.GetAttribute("UserRecvKey");

+                    if (attri == "")

+                    {

+                        this.UserRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from user server", "null");

+                        configData.SetAttribute("GridRecvKey", this.UserRecvKey);

+                    }

+                    else

+                    {

+                        this.UserRecvKey = attri;

+                    }

+

                     attri = "";

                     attri = configData.GetAttribute("AssetServerURL");

                     if (attri == "")

diff --git a/Common/OpenSim.Framework/Types/ParcelData.cs b/OpenSim/Framework/General/Types/ParcelData.cs
index 40f128a..40f128a 100644
--- a/Common/OpenSim.Framework/Types/ParcelData.cs
+++ b/OpenSim/Framework/General/Types/ParcelData.cs
diff --git a/Common/OpenSim.Framework/Types/PrimData.cs b/OpenSim/Framework/General/Types/PrimData.cs
index f84ae3e..f84ae3e 100644
--- a/Common/OpenSim.Framework/Types/PrimData.cs
+++ b/OpenSim/Framework/General/Types/PrimData.cs
diff --git a/Common/OpenSim.Framework/Types/RegionHandle.cs b/OpenSim/Framework/General/Types/RegionHandle.cs
index 1271d04..1271d04 100644
--- a/Common/OpenSim.Framework/Types/RegionHandle.cs
+++ b/OpenSim/Framework/General/Types/RegionHandle.cs
diff --git a/Common/OpenSim.Framework/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs
index 48e6922..0fba6ca 100644
--- a/Common/OpenSim.Framework/Types/RegionInfo.cs
+++ b/OpenSim/Framework/General/Types/RegionInfo.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("SimLocationX");

                 if (attri == "")

                 {

-                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "997");

+                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "1000");

                     configData.SetAttribute("SimLocationX", location);

                     this.RegionLocX = (uint)Convert.ToUInt32(location);

                 }

@@ -123,7 +123,7 @@ namespace OpenSim.Framework.Types
                 attri = configData.GetAttribute("SimLocationY");

                 if (attri == "")

                 {

-                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "996");

+                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "1000");

                     configData.SetAttribute("SimLocationY", location);

                     this.RegionLocY = (uint)Convert.ToUInt32(location);

                 }