OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ooopsss

0.9.0-post-fixes
UbitUmarov 2017-07-15 20:59:16 +01:00
parent 4b7f79e296
commit ad46a29d9e
1 changed files with 47 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
View File

@ -282,9 +282,11 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
string copsename = ((string)args[0]).Trim(); string copsename = ((string)args[0]).Trim();
Boolean freezeState = (Boolean) args[1]; Boolean freezeState = (Boolean) args[1];
lock(mylock)
{
foreach (Copse cp in m_copses) foreach (Copse cp in m_copses)
{ {
if (cp.m_name == copsename) if (cp.m_name != copsename)
continue; continue;
if(!cp.m_frozen && freezeState || cp.m_frozen && !freezeState) if(!cp.m_frozen && freezeState || cp.m_frozen && !freezeState)
@ -332,6 +334,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
return; return;
} }
} }
}
m_log.InfoFormat("[TREES]: Copse {0} was not found - command failed", copsename); m_log.InfoFormat("[TREES]: Copse {0} was not found - command failed", copsename);
} }
@ -382,6 +385,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
else else
{ {
m_log.InfoFormat("[TREES]: Copse {0} has already been planted", copsename); m_log.InfoFormat("[TREES]: Copse {0} has already been planted", copsename);
return;
} }
} }
} }
@ -465,6 +469,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
private void HandleTreeStatistics(Object[] args) private void HandleTreeStatistics(Object[] args)
{ {
m_log.InfoFormat("[TREES]: region {0}:", m_scene.Name);
m_log.InfoFormat("[TREES]: Activity State: {0}; Update Rate: {1}", m_active_trees, m_update_ms); m_log.InfoFormat("[TREES]: Activity State: {0}; Update Rate: {1}", m_active_trees, m_update_ms);
foreach (Copse cp in m_copses) foreach (Copse cp in m_copses)
{ {
@ -909,9 +914,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
killTrees(); killTrees();
} }
} }
catch(Exception ex) catch { }
{
}
if(CalculateTrees != null) if(CalculateTrees != null)
CalculateTrees.Start(); CalculateTrees.Start();
Monitor.Exit(mylock); Monitor.Exit(mylock);