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

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2009-11-28 09:26:00 +00:00
parent aa695e92f7 9fd9211a38
commit d3e7a52933
20 changed files with 119 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -4410,16 +4410,6 @@ namespace OpenSim.Region.Framework.Scenes
#endregion
#region Avatar Appearance Default
public static void GetDefaultAvatarAppearance(out AvatarWearable[] wearables, out byte[] visualParams)
{
visualParams = AvatarAppearance.GetDefaultVisualParams();
wearables = AvatarWearable.DefaultWearables;
}
#endregion
public void RegionHandleRequest(IClientAPI client, UUID regionID)
{
ulong handle = 0;

10
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
View File

@@ -238,7 +238,7 @@ namespace OpenSim.Region.Framework.Scenes
sb[12].StatValue = m_otherMS / statsUpdateFactor;
sb[13].StatID = (uint)Stats.InPacketsPerSecond;
sb[13].StatValue = (m_inPacketsPerSecond);
sb[13].StatValue = (m_inPacketsPerSecond / statsUpdateFactor);
sb[14].StatID = (uint)Stats.OutPacketsPerSecond;
sb[14].StatValue = (m_outPacketsPerSecond / statsUpdateFactor);
@@ -285,8 +285,8 @@ namespace OpenSim.Region.Framework.Scenes
m_fps = 0;
m_pfps = 0;
m_agentUpdates = 0;
m_inPacketsPerSecond = 0;
m_outPacketsPerSecond = 0;
//m_inPacketsPerSecond = 0;
//m_outPacketsPerSecond = 0;
m_unAckedBytes = 0;
m_scriptLinesPerSecond = 0;
@@ -373,12 +373,12 @@ namespace OpenSim.Region.Framework.Scenes
public void AddInPackets(int numPackets)
{
m_inPacketsPerSecond += numPackets;
m_inPacketsPerSecond = numPackets;
}
public void AddOutPackets(int numPackets)
{
m_outPacketsPerSecond += numPackets;
m_outPacketsPerSecond = numPackets;
}
public void AddunAckedBytes(int numBytes)