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/RegionInfo.cs')
-rw-r--r-- | OpenSim.RegionServer/RegionInfo.cs | 13 |
1 files changed, 12 insertions, 1 deletions
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 | |||
25 | 25 | ||
26 | //following should be removed and the GenericConfig object passed around, | 26 | //following should be removed and the GenericConfig object passed around, |
27 | //so each class (AssetServer, GridServer etc) can access what config data they want | 27 | //so each class (AssetServer, GridServer etc) can access what config data they want |
28 | public string AssetURL = ""; | 28 | public string AssetURL = "http://127.0.0.1:8003/"; |
29 | public string AssetSendKey = ""; | 29 | public string AssetSendKey = ""; |
30 | 30 | ||
31 | public string GridURL = ""; | 31 | public string GridURL = ""; |
@@ -230,6 +230,17 @@ namespace OpenSim | |||
230 | this.GridRecvKey = attri; | 230 | this.GridRecvKey = attri; |
231 | } | 231 | } |
232 | 232 | ||
233 | attri = ""; | ||
234 | attri = configData.GetAttribute("AssetServerURL"); | ||
235 | if (attri == "") | ||
236 | { | ||
237 | this.AssetURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/"); | ||
238 | configData.SetAttribute("AssetServerURL", this.GridURL); | ||
239 | } | ||
240 | else | ||
241 | { | ||
242 | this.AssetURL = attri; | ||
243 | } | ||
233 | 244 | ||
234 | } | 245 | } |
235 | this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256)); | 246 | this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256)); |