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

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

@ -282,54 +282,57 @@ 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];
foreach (Copse cp in m_copses) lock(mylock)
{ {
if (cp.m_name == copsename) foreach (Copse cp in m_copses)
continue;
if(!cp.m_frozen && freezeState || cp.m_frozen && !freezeState)
{ {
cp.m_frozen = freezeState; if (cp.m_name != copsename)
List<UUID> losttrees = new List<UUID>(); continue;
foreach (UUID tree in cp.m_trees)
if(!cp.m_frozen && freezeState || cp.m_frozen && !freezeState)
{ {
SceneObjectGroup sog = m_scene.GetSceneObjectGroup(tree); cp.m_frozen = freezeState;
if(sog != null && !sog.IsDeleted) List<UUID> losttrees = new List<UUID>();
foreach (UUID tree in cp.m_trees)
{ {
SceneObjectPart sop = sog.RootPart; SceneObjectGroup sog = m_scene.GetSceneObjectGroup(tree);
string name = sop.Name; if(sog != null && !sog.IsDeleted)
if(freezeState)
{ {
if(name.StartsWith("FTPM")) SceneObjectPart sop = sog.RootPart;
continue; string name = sop.Name;
if(!name.StartsWith("ATPM")) if(freezeState)
continue; {
sop.Name = sop.Name.Replace("ATPM", "FTPM"); if(name.StartsWith("FTPM"))
continue;
if(!name.StartsWith("ATPM"))
continue;
sop.Name = sop.Name.Replace("ATPM", "FTPM");
}
else
{
if(name.StartsWith("ATPM"))
continue;
if(!name.StartsWith("FTPM"))
continue;
sop.Name = sop.Name.Replace("FTPM", "ATPM");
}
sop.ParentGroup.HasGroupChanged = true;
sog.ScheduleGroupForFullUpdate();
} }
else else
{ losttrees.Add(tree);
if(name.StartsWith("ATPM"))
continue;
if(!name.StartsWith("FTPM"))
continue;
sop.Name = sop.Name.Replace("FTPM", "ATPM");
}
sop.ParentGroup.HasGroupChanged = true;
sog.ScheduleGroupForFullUpdate();
} }
else foreach (UUID tree in losttrees)
losttrees.Add(tree); cp.m_trees.Remove(tree);
}
foreach (UUID tree in losttrees)
cp.m_trees.Remove(tree);
m_log.InfoFormat("[TREES]: Activity for copse {0} is frozen {1}", copsename, freezeState); m_log.InfoFormat("[TREES]: Activity for copse {0} is frozen {1}", copsename, freezeState);
return; return;
} }
else else
{ {
m_log.InfoFormat("[TREES]: Copse {0} is already in the requested freeze state", copsename); m_log.InfoFormat("[TREES]: Copse {0} is already in the requested freeze state", copsename);
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,10 +469,11 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
private void HandleTreeStatistics(Object[] args) private void HandleTreeStatistics(Object[] args)
{ {
m_log.InfoFormat("[TREES]: Activity State: {0}; Update Rate: {1}", m_active_trees, m_update_ms); 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);
foreach (Copse cp in m_copses) foreach (Copse cp in m_copses)
{ {
m_log.InfoFormat("[TREES]: Copse {0}; {1} trees; frozen {2}", cp.m_name, cp.m_trees.Count, cp.m_frozen); m_log.InfoFormat("[TREES]: Copse {0}; {1} trees; frozen {2}", cp.m_name, cp.m_trees.Count, cp.m_frozen);
} }
} }
@ -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);