Should allow multiple worlds (and UDP servers) to be ran in one instance, just missing backend comms and working Avatar/primitives classes.

1 files changed, 3 insertions, 67 deletions

diff --git a/OpenSim/OpenSim.RegionServer/RegionInfo.cs b/OpenSim/OpenSim.RegionServer/RegionInfo.cs
index 76f05b6..d148d0f 100644
--- a/OpenSim/OpenSim.RegionServer/RegionInfo.cs
+++ b/OpenSim/OpenSim.RegionServer/RegionInfo.cs
@@ -7,22 +7,13 @@ using System.IO;
 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Utilities;

 using libsecondlife;

+using OpenSim.Framework.Types;

 

 namespace OpenSim

 {

     public class RegionInfo : RegionInfoBase

     {

-        //following should be removed and the GenericConfig object passed around,

-        //so each class (AssetServer, GridServer etc) can access what config data they want 

-        public string AssetURL = "http://127.0.0.1:8003/";

-        public string AssetSendKey = "";

-

-        public string GridURL = "";

-        public string GridSendKey = "";

-        public string GridRecvKey = "";

-        public string UserURL = "";

-        public string UserSendKey = "";

-        public string UserRecvKey = "";

+        

         private bool isSandbox;

 

         public string DataStore;

@@ -129,62 +120,7 @@ namespace OpenSim
                     this.IPListenAddr = attri;

                 }

 

-                if (!isSandbox)

-                {

-                    //shouldn't be reading this data in here, it should be up to the classes implementing the server interfaces to read what they need from the config object

-

-                    //Grid Server URL

-                    attri = "";

-                    attri = configData.GetAttribute("GridServerURL");

-                    if (attri == "")

-                    {

-                        this.GridURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/");

-                        configData.SetAttribute("GridServerURL", this.GridURL);

-                    }

-                    else

-                    {

-                        this.GridURL = attri;

-                    }

-

-                    //Grid Send Key

-                    attri = "";

-                    attri = configData.GetAttribute("GridSendKey");

-                    if (attri == "")

-                    {

-                        this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server","null");

-                        configData.SetAttribute("GridSendKey", this.GridSendKey);

-                    }

-                    else

-                    {

-                        this.GridSendKey = attri;

-                    }

-

-                    //Grid Receive Key

-                    attri = "";

-                    attri = configData.GetAttribute("GridRecvKey");

-                    if (attri == "")

-                    {

-                        this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server","null");

-                        configData.SetAttribute("GridRecvKey", this.GridRecvKey);

-                    }

-                    else

-                    {

-                        this.GridRecvKey = attri;

-                    }

-

-                    attri = "";

-                    attri = configData.GetAttribute("AssetServerURL");

-                    if (attri == "")

-                    {

-                        this.AssetURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/");

-                        configData.SetAttribute("AssetServerURL", this.GridURL);

-                    }

-                    else

-                    {

-                        this.AssetURL = attri;

-                    }

-

-                }

+               

                 this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));

                

                 configData.Commit();