3 files changed, 15 insertions, 4 deletions

diff --git a/OpenSim.RegionServer/Assets/AssetCache.cs b/OpenSim.RegionServer/Assets/AssetCache.cs
index e217d78..e8bf292 100644
--- a/OpenSim.RegionServer/Assets/AssetCache.cs
+++ b/OpenSim.RegionServer/Assets/AssetCache.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Assets
         {

             //hack: so we can give each user a set of textures

             textureList[0] = new LLUUID("00000000-0000-0000-9999-000000000001");

-            textureList[1] = new LLUUID("00000000-0000-0000-9999-000000000002");

+           textureList[1] = new LLUUID("00000000-0000-0000-9999-000000000002");

             textureList[2] = new LLUUID("00000000-0000-0000-9999-000000000003");

             textureList[3] = new LLUUID("00000000-0000-0000-9999-000000000004");

             textureList[4] = new LLUUID("00000000-0000-0000-9999-000000000005");

diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index fa13064..fc604b7 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -130,7 +130,7 @@ namespace OpenSim
             GridServers = new Grid();

             if (m_sandbox)

             {

-                GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll";

+                GridServers.AssetDll =  "OpenSim.GridInterfaces.Local.dll";

                 GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll";

 

                 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Starting in Sandbox mode");

@@ -177,7 +177,7 @@ namespace OpenSim
 

 

             //should be passing a IGenericConfig object to these so they can read the config data they want from it

-            GridServers.AssetServer.SetServerInfo(regionData.AssetURL, regionData.AssetSendKey);

+           GridServers.AssetServer.SetServerInfo(regionData.AssetURL, regionData.AssetSendKey);

             IGridServer gridServer = GridServers.GridServer;

             gridServer.SetServerInfo(regionData.GridURL, regionData.GridSendKey, regionData.GridRecvKey);

 

diff --git a/OpenSim.RegionServer/RegionInfo.cs b/OpenSim.RegionServer/RegionInfo.cs
index edab1e5..2707257 100644
--- a/OpenSim.RegionServer/RegionInfo.cs
+++ b/OpenSim.RegionServer/RegionInfo.cs
@@ -25,7 +25,7 @@ namespace OpenSim
 

         //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 = "";

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

         public string AssetSendKey = "";

 

         public string GridURL = "";

@@ -230,6 +230,17 @@ namespace OpenSim
                         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));