aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTleiades Hax2007-10-19 07:43:10 +0000
committerTleiades Hax2007-10-19 07:43:10 +0000
commit2681bc46c4196a3d1f61e993a609b53650ab9028 (patch)
tree23206af17b3099d0a76e7e2499569d96ddfd476d
parentbuild notes for linux openjpeg (diff)
downloadopensim-SC_OLD-2681bc46c4196a3d1f61e993a609b53650ab9028.zip
opensim-SC_OLD-2681bc46c4196a3d1f61e993a609b53650ab9028.tar.gz
opensim-SC_OLD-2681bc46c4196a3d1f61e993a609b53650ab9028.tar.bz2
opensim-SC_OLD-2681bc46c4196a3d1f61e993a609b53650ab9028.tar.xz
Fix for assetserver crashing (Thank you Chi11ken)
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs11
1 files changed, 4 insertions, 7 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 1fa27ef..7a7c843 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -51,12 +51,11 @@ namespace OpenSim.Grid.AssetServer
51 /// </summary> 51 /// </summary>
52 public class OpenAsset_Main : conscmd_callback 52 public class OpenAsset_Main : conscmd_callback
53 { 53 {
54 public AssetConfig Cfg; 54 public AssetConfig m_config;
55 55
56 public static OpenAsset_Main assetserver; 56 public static OpenAsset_Main assetserver;
57 57
58 private LogBase m_console; 58 private LogBase m_console;
59 private AssetConfig m_config;
60 private IAssetServer m_assetServer; 59 private IAssetServer m_assetServer;
61 60
62 [STAThread] 61 [STAThread]
@@ -98,13 +97,12 @@ namespace OpenSim.Grid.AssetServer
98 setupDB(m_config); 97 setupDB(m_config);
99 98
100 m_console.Verbose("ASSET", "Starting HTTP process"); 99 m_console.Verbose("ASSET", "Starting HTTP process");
101 BaseHttpServer httpServer = new BaseHttpServer((int)Cfg.HttpPort); 100 BaseHttpServer httpServer = new BaseHttpServer((int)m_config.HttpPort);
102 101
103 httpServer.AddStreamHandler( new GetAssetStreamHandler(this)); 102 httpServer.AddStreamHandler(new GetAssetStreamHandler(this));
104 httpServer.AddStreamHandler(new PostAssetStreamHandler( this )); 103 httpServer.AddStreamHandler(new PostAssetStreamHandler( this ));
105 104
106 httpServer.Start(); 105 httpServer.Start();
107
108 } 106 }
109 107
110 public byte[] GetAssetData(LLUUID assetID, bool isTexture) 108 public byte[] GetAssetData(LLUUID assetID, bool isTexture)
@@ -125,7 +123,6 @@ namespace OpenSim.Grid.AssetServer
125 } 123 }
126 } 124 }
127 125
128
129 public void RunCmd(string cmd, string[] cmdparams) 126 public void RunCmd(string cmd, string[] cmdparams)
130 { 127 {
131 switch (cmd) 128 switch (cmd)
@@ -165,7 +162,7 @@ namespace OpenSim.Grid.AssetServer
165 } 162 }
166 } 163 }
167 164
168 public GetAssetStreamHandler(OpenAsset_Main assetManager):base( "/assets/", "GET") 165 public GetAssetStreamHandler(OpenAsset_Main assetManager) : base("/assets/", "GET")
169 { 166 {
170 m_assetManager = assetManager; 167 m_assetManager = assetManager;
171 } 168 }