aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/Application.cs1
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs5
-rw-r--r--OpenSim/Region/Environment/Modules/AssetDownloadModule.cs8
3 files changed, 3 insertions, 11 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 0e2608a..6faca1b 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -68,7 +68,6 @@ namespace OpenSim
68 configSource.AddSwitch("Startup", "inifile"); 68 configSource.AddSwitch("Startup", "inifile");
69 configSource.AddSwitch("Startup", "gridmode"); 69 configSource.AddSwitch("Startup", "gridmode");
70 configSource.AddSwitch("Startup", "physics"); 70 configSource.AddSwitch("Startup", "physics");
71 configSource.AddSwitch("Startup", "verbose");
72 configSource.AddSwitch("Startup", "useexecutepath"); 71 configSource.AddSwitch("Startup", "useexecutepath");
73 72
74 configSource.AddConfig("StandAlone"); 73 configSource.AddConfig("StandAlone");
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 6e89143..bdefd0f 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -78,7 +78,6 @@ namespace OpenSim
78 protected List<UDPServer> m_udpServers = new List<UDPServer>(); 78 protected List<UDPServer> m_udpServers = new List<UDPServer>();
79 protected List<RegionInfo> m_regionData = new List<RegionInfo>(); 79 protected List<RegionInfo> m_regionData = new List<RegionInfo>();
80 80
81 private bool m_verbose;
82 private bool m_physicalPrim; 81 private bool m_physicalPrim;
83 private bool m_permissions = false; 82 private bool m_permissions = false;
84 83
@@ -173,7 +172,6 @@ namespace OpenSim
173 { 172 {
174 config.Set("gridmode", false); 173 config.Set("gridmode", false);
175 config.Set("physics", "basicphysics"); 174 config.Set("physics", "basicphysics");
176 config.Set("verbose", true);
177 config.Set("physical_prim", true); 175 config.Set("physical_prim", true);
178 config.Set("see_into_this_sim_from_neighbor", true); 176 config.Set("see_into_this_sim_from_neighbor", true);
179 config.Set("serverside_object_permissions", false); 177 config.Set("serverside_object_permissions", false);
@@ -241,9 +239,6 @@ namespace OpenSim
241 m_physicsEngine = startupConfig.GetString("physics", "basicphysics"); 239 m_physicsEngine = startupConfig.GetString("physics", "basicphysics");
242 m_meshEngineName = startupConfig.GetString("meshing", "ZeroMesher"); 240 m_meshEngineName = startupConfig.GetString("meshing", "ZeroMesher");
243 241
244 // TODO: since log4net changes, verbose flag doesn't do anything
245 m_verbose = startupConfig.GetBoolean("verbose", true);
246
247 m_physicalPrim = startupConfig.GetBoolean("physical_prim", true); 242 m_physicalPrim = startupConfig.GetBoolean("physical_prim", true);
248 243
249 m_see_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true); 244 m_see_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true);
diff --git a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
index f53be41..33c0ce2 100644
--- a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
@@ -131,7 +131,6 @@ namespace OpenSim.Region.Environment.Modules
131 { 131 {
132 if (!userRequests.ContainsKey(requestID)) 132 if (!userRequests.ContainsKey(requestID))
133 { 133 {
134
135 AssetRequest request = new AssetRequest(); 134 AssetRequest request = new AssetRequest();
136 request.RequestUser = userInfo; 135 request.RequestUser = userInfo;
137 request.RequestAssetID = requestID; 136 request.RequestAssetID = requestID;
@@ -154,9 +153,7 @@ namespace OpenSim.Region.Environment.Modules
154 userRequests.Add(requestID, request); 153 userRequests.Add(requestID, request);
155 RequestedAssets[userInfo.AgentId] = userRequests; 154 RequestedAssets[userInfo.AgentId] = userRequests;
156 m_scene.AssetCache.GetAsset(requestID, AssetCallback, false); 155 m_scene.AssetCache.GetAsset(requestID, AssetCallback, false);
157
158 } 156 }
159 return;
160 } 157 }
161 158
162 public void AssetCallback(LLUUID assetID, AssetBase asset) 159 public void AssetCallback(LLUUID assetID, AssetBase asset)
@@ -190,7 +187,7 @@ namespace OpenSim.Region.Environment.Modules
190 ProcessAssetQueue(); 187 ProcessAssetQueue();
191 Thread.Sleep(500); 188 Thread.Sleep(500);
192 } 189 }
193 catch (Exception e) 190 catch (Exception)
194 { 191 {
195 // m_log.Error("[ASSET CACHE]: " + e.ToString()); 192 // m_log.Error("[ASSET CACHE]: " + e.ToString());
196 } 193 }
@@ -292,6 +289,7 @@ namespace OpenSim.Region.Environment.Modules
292 AssetRequests.RemoveAt(0); 289 AssetRequests.RemoveAt(0);
293 } 290 }
294 } 291 }
292
295 /// <summary> 293 /// <summary>
296 /// Calculate the number of packets required to send the asset to the client. 294 /// Calculate the number of packets required to send the asset to the client.
297 /// </summary> 295 /// </summary>
@@ -335,4 +333,4 @@ namespace OpenSim.Region.Environment.Modules
335 } 333 }
336 } 334 }
337 } 335 }
338} \ No newline at end of file 336}