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

Some little changes to clean up refresh to 0719

dsg
Dan Lake 2010-09-23 11:51:34 -07:00
parent 188a2db02a
commit 1c93854b47
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -3489,9 +3489,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private void ProcessEntityUpdates(int maxUpdates) private void ProcessEntityUpdates(int maxUpdates)
{ {
Lazy<List<ObjectUpdatePacket.ObjectDataBlock>> objectUpdateBlocks = new Lazy<List<ObjectUpdatePacket.ObjectDataBlock>>(); OpenSim.Framework.Lazy<List<ObjectUpdatePacket.ObjectDataBlock>> objectUpdateBlocks = new OpenSim.Framework.Lazy<List<ObjectUpdatePacket.ObjectDataBlock>>();
Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>> compressedUpdateBlocks = new Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>>(); OpenSim.Framework.Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>> compressedUpdateBlocks = new OpenSim.Framework.Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>>();
Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>> terseUpdateBlocks = new Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>>(); OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>> terseUpdateBlocks = new OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>>();
if (maxUpdates <= 0) maxUpdates = Int32.MaxValue; if (maxUpdates <= 0) maxUpdates = Int32.MaxValue;
int updatesThisCall = 0; int updatesThisCall = 0;

2
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClientView.cs
View File

@ -482,7 +482,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
ScenePresence presence; ScenePresence presence;
if (m_scene.TryGetScenePresence(agentID, out presence)) if (m_scene.TryGetScenePresence(agentID, out presence))
{ {
int delay = 5000; int delay = 30000;
string name = presence.Name; string name = presence.Name;
//m_log.WarnFormat("{0} Waiting {1}ms before setting appearance on presence {2} <{3}>", LogHeader, delay, name, msgID); //m_log.WarnFormat("{0} Waiting {1}ms before setting appearance on presence {2} <{3}>", LogHeader, delay, name, msgID);
Timer appearanceSetter = new Timer(delegate(object obj) Timer appearanceSetter = new Timer(delegate(object obj)

18
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -439,6 +439,7 @@ namespace OpenSim.Region.Framework.Scenes
public IClientAPI ControllingClient public IClientAPI ControllingClient
{ {
get { return m_controllingClient; } get { return m_controllingClient; }
set { m_controllingClient = value; }
} }
public IClientCore ClientView public IClientCore ClientView
@ -565,6 +566,20 @@ namespace OpenSim.Region.Framework.Scenes
set { m_health = value; } set { m_health = value; }
} }
private bool m_isSyncedAvatar;
public bool IsSyncedAvatar
{
get { return m_isSyncedAvatar; }
set { m_isSyncedAvatar = value; }
}
private bool m_isBalancing;
public bool IsBalancing
{
get { return m_isBalancing; }
set { m_isBalancing = value; }
}
/// <summary> /// <summary>
/// These are the region handles known by the avatar. /// These are the region handles known by the avatar.
/// </summary> /// </summary>
@ -753,7 +768,7 @@ namespace OpenSim.Region.Framework.Scenes
public void RegisterToEvents() public void RegisterToEvents()
{ {
// REGION SYNC // REGION SYNC
if (!m_scene.IsSyncedClient()) if (!m_scene.IsSyncedServer())// || m_scene.RegionSyncEnabled == false)
{ {
// These client messages will not be handled by client managers but instead // These client messages will not be handled by client managers but instead
// they are caught by the RegionSyncClient module and passed up to the auth sim // they are caught by the RegionSyncClient module and passed up to the auth sim
@ -2436,6 +2451,7 @@ namespace OpenSim.Region.Framework.Scenes
m_perfMonMS = Util.EnvironmentTickCount(); m_perfMonMS = Util.EnvironmentTickCount();
m_controllingClient.SendCoarseLocationUpdate(avatarUUIDs, coarseLocations); m_controllingClient.SendCoarseLocationUpdate(avatarUUIDs, coarseLocations);
m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS));
}
/// <summary> /// <summary>
/// Tell other client about this avatar (The client previously didn't know or had outdated details about this avatar) /// Tell other client about this avatar (The client previously didn't know or had outdated details about this avatar)