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

Removed code for handling UpdatedObject sync messages. We no longer send this message.

dsg
Huaiyu (Kitty) Liu 2011-05-12 15:47:04 -07:00
parent cf6c9e77a0
commit d04c298c0b
3 changed files with 2 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/PhysEngineToSceneConnector.cs
View File

@ -481,13 +481,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
{
// TODO: modify for physics
OSDMap data = DeserializeMessage(msg);
/*
if (data["locX"] == null || data["locY"] == null || data["sogXml"] == null)
{
m_log.Warn(LogHeader + ": parameters missing in NewObject/UpdatedObject message, need to have locX, locY, sogXml");
return;
}
* */
uint locX = data["locX"].AsUInteger();
uint locY = data["locY"].AsUInteger();
string sogxml = data["sogXml"].AsString();

43
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs
View File

@ -793,9 +793,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
foreach (SyncConnector connector in syncConnectors)
{
//string sogxml = SceneObjectSerializer.ToXml2Format(sog);
//SymmetricSyncMessage syncMsg = new SymmetricSyncMessage(SymmetricSyncMessage.MsgType.UpdatedObject, sogxml);
//m_log.Debug("Send " + syncMsg.Type.ToString() + " about sop " + updatedPart.Name + "," + updatedPart.UUID + " at pos "+updatedPart.GroupPosition.ToString()
//+" to " + connector.OtherSideActorID);
@ -828,7 +825,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
/// <summary>
/// Send some special object updatess to other sync nodes, including:
/// NewObject, RemoveObject, LinkObject. The sync messages are sent out right
/// away, without being enqueue'ed as UpdatedObject messages.
/// away, without being enqueue'ed as object update messages.
/// </summary>
/// <param name="sog"></param>
/// <param name="syncMsg"></param>
@ -1505,11 +1502,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
case SymmetricSyncMessage.MsgType.UpdatedPrimProperties:
HandleUpdatedPrimProperties(msg, senderActorID);
break;
case SymmetricSyncMessage.MsgType.UpdatedObject:
{
HandleUpdatedObject(msg, senderActorID);
return;
}
case SymmetricSyncMessage.MsgType.RemovedObject:
{
HandleRemovedObject(msg, senderActorID);
@ -1815,42 +1807,9 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
}
}
}
}
///////////////////////////////////////////////////////////////////////
// Bucket sync handlers
///////////////////////////////////////////////////////////////////////
/// <summary>
/// Handler of UpdatedObject message. Note: for a relay node in the
/// sync topology, it won't forward the message right away. Instead,
/// the updates are applied locally, and during each heartbeat loop,
/// updated objects/prims are collected and updates are then sent out
/// from the relay node.
/// </summary>
/// <param name="msg"></param>
/// <param name="senderActorID"></param>
private void HandleUpdatedObject(SymmetricSyncMessage msg, string senderActorID)
{
OSDMap data = DeserializeMessage(msg);
string bucketName = data["Bucket"].AsString();
//lock (m_stats) m_statSOGBucketIn++;
if (m_primUpdatesPerBucketReceiver.ContainsKey(bucketName))
{
m_primUpdatesPerBucketReceiver[bucketName](bucketName, data);
}
else
{
m_log.WarnFormat("{0}: Received an update message for properties bucket {1}, no such bucket supported", LogHeader, bucketName);
}
}
/// <summary>
/// Send out a sync message about the updated Terrain. If this is a relay node,
/// forward the sync message to all connectors except the one which initiated

2
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/SymmetricSyncMessage.cs
View File

@ -48,7 +48,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
Terrain,
NewObject, // objects
UpdatedPrimProperties, //per property sync
UpdatedObject, // objects
//UpdatedObject, // objects
UpdatedBucketProperties, //object properties in one bucket
RemovedObject, // objects
LinkObject,