diff options
Worked on Asset server, asset downloads (from server to sim) now work.
Asset uploads (from sim to server) may or may not work, needs more testing, if they don't work then it should be just a encoding problem and not hard to fix.
Diffstat (limited to 'OpenSim.RegionServer/OpenSimMain.cs')
-rw-r--r-- | OpenSim.RegionServer/OpenSimMain.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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 | |||
130 | GridServers = new Grid(); | 130 | GridServers = new Grid(); |
131 | if (m_sandbox) | 131 | if (m_sandbox) |
132 | { | 132 | { |
133 | GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll"; | 133 | GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll"; |
134 | GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll"; | 134 | GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll"; |
135 | 135 | ||
136 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Starting in Sandbox mode"); | 136 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Starting in Sandbox mode"); |
@@ -177,7 +177,7 @@ namespace OpenSim | |||
177 | 177 | ||
178 | 178 | ||
179 | //should be passing a IGenericConfig object to these so they can read the config data they want from it | 179 | //should be passing a IGenericConfig object to these so they can read the config data they want from it |
180 | GridServers.AssetServer.SetServerInfo(regionData.AssetURL, regionData.AssetSendKey); | 180 | GridServers.AssetServer.SetServerInfo(regionData.AssetURL, regionData.AssetSendKey); |
181 | IGridServer gridServer = GridServers.GridServer; | 181 | IGridServer gridServer = GridServers.GridServer; |
182 | gridServer.SetServerInfo(regionData.GridURL, regionData.GridSendKey, regionData.GridRecvKey); | 182 | gridServer.SetServerInfo(regionData.GridURL, regionData.GridSendKey, regionData.GridRecvKey); |
183 | 183 | ||