diff options
author | lbsa71 | 2007-10-15 08:42:15 +0000 |
---|---|---|
committer | lbsa71 | 2007-10-15 08:42:15 +0000 |
commit | 9de589bc37c4c6d0cb230bb02a3edd8217d1f9ae (patch) | |
tree | fbc6bf234f5f2c4d2ef8d5eb55b6b02a2c947238 /OpenSim/Grid/AssetServer | |
parent | * Added #474 Chillken Windows Installer generating script - haven't tried it,... (diff) | |
download | opensim-SC_OLD-9de589bc37c4c6d0cb230bb02a3edd8217d1f9ae.zip opensim-SC_OLD-9de589bc37c4c6d0cb230bb02a3edd8217d1f9ae.tar.gz opensim-SC_OLD-9de589bc37c4c6d0cb230bb02a3edd8217d1f9ae.tar.bz2 opensim-SC_OLD-9de589bc37c4c6d0cb230bb02a3edd8217d1f9ae.tar.xz |
* Applied Chillken patch #419: consolidate_ports-r2096-3.patch - consolidated port number defaults. Thankx Chillken!
Diffstat (limited to 'OpenSim/Grid/AssetServer')
-rw-r--r-- | OpenSim/Grid/AssetServer/Main.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs index 9272f24..1fa27ef 100644 --- a/OpenSim/Grid/AssetServer/Main.cs +++ b/OpenSim/Grid/AssetServer/Main.cs | |||
@@ -30,6 +30,7 @@ using System; | |||
30 | using System.IO; | 30 | using System.IO; |
31 | 31 | ||
32 | using libsecondlife; | 32 | using libsecondlife; |
33 | using OpenSim.Framework.Configuration; | ||
33 | using OpenSim.Framework.Console; | 34 | using OpenSim.Framework.Console; |
34 | using OpenSim.Framework.Servers; | 35 | using OpenSim.Framework.Servers; |
35 | using OpenSim.Framework.Configuration; | 36 | using OpenSim.Framework.Configuration; |
@@ -50,6 +51,8 @@ namespace OpenSim.Grid.AssetServer | |||
50 | /// </summary> | 51 | /// </summary> |
51 | public class OpenAsset_Main : conscmd_callback | 52 | public class OpenAsset_Main : conscmd_callback |
52 | { | 53 | { |
54 | public AssetConfig Cfg; | ||
55 | |||
53 | public static OpenAsset_Main assetserver; | 56 | public static OpenAsset_Main assetserver; |
54 | 57 | ||
55 | private LogBase m_console; | 58 | private LogBase m_console; |
@@ -95,7 +98,7 @@ namespace OpenSim.Grid.AssetServer | |||
95 | setupDB(m_config); | 98 | setupDB(m_config); |
96 | 99 | ||
97 | m_console.Verbose("ASSET", "Starting HTTP process"); | 100 | m_console.Verbose("ASSET", "Starting HTTP process"); |
98 | BaseHttpServer httpServer = new BaseHttpServer(8003); | 101 | BaseHttpServer httpServer = new BaseHttpServer((int)Cfg.HttpPort); |
99 | 102 | ||
100 | httpServer.AddStreamHandler( new GetAssetStreamHandler(this)); | 103 | httpServer.AddStreamHandler( new GetAssetStreamHandler(this)); |
101 | httpServer.AddStreamHandler(new PostAssetStreamHandler( this )); | 104 | httpServer.AddStreamHandler(new PostAssetStreamHandler( this )); |