ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 18:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

mantis 8909: take number of npcs out of avatars limit check

Browse Source
This commit is contained in:
UbitUmarov
2021-07-16 01:14:51 +01:00
parent 9e7f77135d
commit 011868adc7
4 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@@ -79,10 +79,12 @@ namespace OpenSim.Region.Framework.Scenes
private PhysicsScene _PhyScene;
private int m_numRootAgents = 0;
private int m_numChildAgents = 0;
private int m_numRootNPC = 0;
private int m_numTotalPrim = 0;
private int m_numPrim = 0;
private int m_numMesh = 0;
private int m_numChildAgents = 0;
private int m_physicalPrim = 0;
private int m_activeScripts = 0;
@@ -763,6 +765,14 @@ namespace OpenSim.Region.Framework.Scenes
// Find the index in the list where the old ref was stored and remove the reference
m_scenePresenceLocalIDMap.Remove(oldref.LocalId);
m_scenePresenceList = null;
if(oldref.IsChildAgent)
--m_numChildAgents;
else
{
--m_numRootAgents;
if(oldref.IsNPC)
--m_numRootNPC;
}
}
else
{
@@ -776,17 +786,21 @@ namespace OpenSim.Region.Framework.Scenes
}
}
protected internal void SwapRootChildAgent(bool direction_RC_CR_T_F)
protected internal void SwapRootChildAgent(bool direction_RC_CR_T_F, bool isnpc = false)
{
if (direction_RC_CR_T_F)
{
m_numRootAgents--;
--m_numRootAgents;
if(isnpc)
--m_numRootNPC;
m_numChildAgents++;
}
else
{
m_numChildAgents--;
m_numRootAgents++;
--m_numChildAgents;
++m_numRootAgents;
if (isnpc)
++m_numRootNPC;
}
}
@@ -806,18 +820,25 @@ namespace OpenSim.Region.Framework.Scenes
{
int rootcount = 0;
int childcount = 0;
int rootnpccount = 0;
List<ScenePresence> presences = GetScenePresences();
for (int i = 0; i < presences.Count; ++i)
{
if (presences[i].IsChildAgent)
ScenePresence sp = presences[i];
if (sp.IsChildAgent)
++childcount;
else
{
++rootcount;
};
if(sp.IsNPC)
++rootnpccount;
}
}
m_numRootAgents = rootcount;
m_numChildAgents = childcount;
m_numRootNPC = rootnpccount;
}
public int GetChildAgentCount()
@@ -830,6 +851,11 @@ namespace OpenSim.Region.Framework.Scenes
return m_numRootAgents;
}
public int GetRootNPCCount()
{
return m_numRootNPC;
}
public int GetTotalObjectsCount()
{
return m_numTotalPrim;