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

Added SyncNewObject() to IRegionSyncModule, to be called when new object is 

added to local SceneObject (by local operation, not by receiving sync message).
Code seems good for initial sync when one CM connects to PSA.
dsg
Huaiyu (Kitty) Liu 2011-04-15 12:15:28 -07:00
parent 9dfc0e92b8
commit 21c48088d8
3 changed files with 264 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -336,6 +336,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
} }
} }
//Legacy SendNewObject and SendDeleteObject for Bucket based sync protocol
/// <summary> /// <summary>
/// Send a sync message to add the given object to other sync nodes. /// Send a sync message to add the given object to other sync nodes.
/// </summary> /// </summary>
@ -389,7 +391,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
SendSpecialObjectUpdateToRelevantSyncConnectors(m_actorID, sog, rsm); SendSpecialObjectUpdateToRelevantSyncConnectors(m_actorID, sog, rsm);
//SendSceneEventToRelevantSyncConnectors(m_actorID, rsm, sog); //SendSceneEventToRelevantSyncConnectors(m_actorID, rsm, sog);
} }
public void SendLinkObject(SceneObjectGroup linkedGroup, SceneObjectPart root, List<SceneObjectPart> children) public void SendLinkObject(SceneObjectGroup linkedGroup, SceneObjectPart root, List<SceneObjectPart> children)
{ {
@ -541,6 +543,40 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
} }
} }
/////////////////////////////////////////////////////////////
//New IRegionSyncModule functions for per property sync'ing
/////////////////////////////////////////////////////////////
/// <summary>
/// Called when new object is created in local SceneGraph. (Add new object
/// by receiving sync message should not trigger calling this function.)
/// </summary>
/// <param name="sog"></param>
public void SyncNewObject(SceneObjectGroup sog)
{
//First, add PrimSyncInfoManager's record.
foreach (SceneObjectPart part in sog.Parts)
{
m_primSyncInfoManager.InsertPrimSyncInfo(part, DateTime.Now.Ticks, m_syncID);
}
if (!IsSyncingWithOtherSyncNodes())
{
//no SyncConnector connected. No need to send out sync messages.
return;
}
OSDMap encodedSOG = SceneObjectEncoder(sog);
SymmetricSyncMessage syncMsg = new SymmetricSyncMessage(SymmetricSyncMessage.MsgType.NewObject, OSDParser.SerializeJsonString(encodedSOG));
//SendObjectUpdateToRelevantSyncConnectors(sog, rsm);
//SendSceneEventToRelevantSyncConnectors(m_actorID, rsm, sog);
SendSpecialObjectUpdateToRelevantSyncConnectors(m_actorID, sog, syncMsg);
}
public void SyncDeleteObject(SceneObjectGroup sog, bool softDelete)
{
}
#endregion //IRegionSyncModule #endregion //IRegionSyncModule
@ -762,10 +798,13 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
//if (connector.IsPositionInSyncQuarks(sog.AbsolutePosition)) //if (connector.IsPositionInSyncQuarks(sog.AbsolutePosition))
//{ //{
SymmetricSyncMessage syncMsg = NewObjectMessageEncoder(sog);
//SendToSyncConnector(connector, sog, syncMsg); //SymmetricSyncMessage syncMsg = NewObjectMessageEncoder(sog);
connector.EnqueueOutgoingUpdate(sog.UUID, syncMsg.ToBytes()); OSDMap encodedSOG = SceneObjectEncoder(sog);
SymmetricSyncMessage syncMsg = new SymmetricSyncMessage(SymmetricSyncMessage.MsgType.NewObject, OSDParser.SerializeJsonString(encodedSOG));
//SendToSyncConnector(connector, sog, syncMsg);
connector.EnqueueOutgoingUpdate(sog.UUID, syncMsg.ToBytes());
//} //}
} }
} }
@ -2177,8 +2216,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
private void HandleAddNewObject(SymmetricSyncMessage msg, string senderActorID) private void HandleAddNewObject(SymmetricSyncMessage msg, string senderActorID)
{ {
//string sogxml = Encoding.ASCII.GetString(msg.Data, 0, msg.Length);
//SceneObjectGroup sog = SceneObjectSerializer.FromXml2Format(sogxml);
OSDMap data = DeserializeMessage(msg); OSDMap data = DeserializeMessage(msg);
//if this is a relay node, forward the event //if this is a relay node, forward the event
@ -2196,9 +2233,10 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
} }
* */ * */
Object sog; //NewObjectMessageDecoder(data, out sog);
NewObjectMessageDecoder(data, out sog);
SceneObjectGroup group = (SceneObjectGroup)sog; //SceneObjectGroup group = SceneObjectDecoder(
AddNewSceneObjectByDecoding(data);
} }
@ -3573,7 +3611,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
{ {
m_property = property; m_property = property;
m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
} }
public PropertySyncInfo(SceneObjectPartSyncProperties property, Object initValue, long initTS, string syncID) public PropertySyncInfo(SceneObjectPartSyncProperties property, Object initValue, long initTS, string syncID)
@ -3869,7 +3907,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
default: default:
m_log.WarnFormat("PrimSynInfo.PropertyToOSD -- no handler for property {0} ", m_property); m_log.WarnFormat("PrimSynInfo.PropertyToOSD -- no handler for property {0} ", m_property);
break; break;
} }
return propertyData; return propertyData;
} }
@ -3879,238 +3917,241 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
if (!propertyData.ContainsKey("LastUpdateTimeStamp")) if (!propertyData.ContainsKey("LastUpdateTimeStamp"))
{ {
m_log.WarnFormat("PrimSynInfo.FromOSDMap -- OSDMap missing LastUpdateTimeStamp"); m_log.WarnFormat("PrimSynInfo.FromOSDMap -- OSDMap missing LastUpdateTimeStamp");
}else{ }
else
{
m_lastUpdateTimeStamp = propertyData["LastUpdateTimeStamp"].AsLong(); m_lastUpdateTimeStamp = propertyData["LastUpdateTimeStamp"].AsLong();
} }
if (!propertyData.ContainsKey("LastUpdateSyncID")) if (!propertyData.ContainsKey("LastUpdateSyncID"))
{
m_log.WarnFormat("PrimSynInfo.FromOSDMap -- OSDMap missing LastUpdateSyncID");
}else{
m_lastUpdateSyncID = propertyData["LastUpdateSyncID"].AsString();
}
if (!propertyData.ContainsKey("Value"))
{ {
m_log.WarnFormat("PrimSynInfo.FromOSDMap -- OSDMap missing LastUpdateSyncID"); m_log.WarnFormat("PrimSynInfo.FromOSDMap -- OSDMap missing LastUpdateSyncID");
} }
else else
{ {
switch (m_property) m_lastUpdateSyncID = propertyData["LastUpdateSyncID"].AsString();
{ }
///////////////////////////////////////
//SOP properties with complex structure
///////////////////////////////////////
case SceneObjectPartSyncProperties.Shape:
case SceneObjectPartSyncProperties.TaskInventory:
m_lastUpdateValue = (Object)propertyData["Value"].AsString();
break;
//////////////////////////// //We do not test if propertyData.ContainsKey("Value"), since Jason
//SOP properties, enum types //serialization seems does not include a value if it's equals to
//////////////////////////// //the default value. So just let Jason decoding to set the value
case SceneObjectPartSyncProperties.AggregateScriptEvents: //either by reading out of the OSDMap, or set to default value.
scriptEvents sEvents = (scriptEvents)(propertyData["Value"].AsInteger());
m_lastUpdateValue = (Object)sEvents;
//propertyData["Value"] = OSD.FromInteger((int)((scriptEvents)LastUpdateValue));
break;
case SceneObjectPartSyncProperties.Flags:
PrimFlags flags = (PrimFlags)(propertyData["Value"].AsInteger());
m_lastUpdateValue = (Object)flags;
//propertyData["Value"] = OSD.FromInteger((int)((PrimFlags)LastUpdateValue));
break;
////////////////////////////
//SOP properties, bool types
////////////////////////////
case SceneObjectPartSyncProperties.AllowedDrop:
case SceneObjectPartSyncProperties.IsAttachment:
case SceneObjectPartSyncProperties.PassTouches:
m_lastUpdateValue = (Object)(propertyData["Value"].AsBoolean());
//propertyData["Value"] = OSD.FromBoolean((bool)LastUpdateValue);
break;
//////////////////////////// switch (m_property)
//SOP properties, Vector3 types {
//////////////////////////// ///////////////////////////////////////
case SceneObjectPartSyncProperties.AngularVelocity: //SOP properties with complex structure
case SceneObjectPartSyncProperties.AttachedPos: ///////////////////////////////////////
case SceneObjectPartSyncProperties.GroupPosition: case SceneObjectPartSyncProperties.Shape:
case SceneObjectPartSyncProperties.OffsetPosition: case SceneObjectPartSyncProperties.TaskInventory:
case SceneObjectPartSyncProperties.Scale: m_lastUpdateValue = (Object)propertyData["Value"].AsString();
case SceneObjectPartSyncProperties.SitTargetPosition: break;
case SceneObjectPartSyncProperties.SitTargetPositionLL:
case SceneObjectPartSyncProperties.SOP_Acceleration:
case SceneObjectPartSyncProperties.Velocity:
//propertyData["Value"] = OSD.FromVector3((Vector3)LastUpdateValue);
m_lastUpdateValue = (Object)(propertyData["Value"].AsVector3());
break;
//////////////////////////// ////////////////////////////
//SOP properties, UUID types //SOP properties, enum types
//////////////////////////// ////////////////////////////
case SceneObjectPartSyncProperties.AttachedAvatar: case SceneObjectPartSyncProperties.AggregateScriptEvents:
case SceneObjectPartSyncProperties.CollisionSound: scriptEvents sEvents = (scriptEvents)(propertyData["Value"].AsInteger());
case SceneObjectPartSyncProperties.CreatorID: m_lastUpdateValue = (Object)sEvents;
case SceneObjectPartSyncProperties.FolderID: //propertyData["Value"] = OSD.FromInteger((int)((scriptEvents)LastUpdateValue));
case SceneObjectPartSyncProperties.GroupID: break;
case SceneObjectPartSyncProperties.LastOwnerID: case SceneObjectPartSyncProperties.Flags:
case SceneObjectPartSyncProperties.OwnerID: PrimFlags flags = (PrimFlags)(propertyData["Value"].AsInteger());
case SceneObjectPartSyncProperties.Sound: m_lastUpdateValue = (Object)flags;
//propertyData["Value"] = OSD.FromUUID((UUID)LastUpdateValue); //propertyData["Value"] = OSD.FromInteger((int)((PrimFlags)LastUpdateValue));
m_lastUpdateValue = (Object)(propertyData["Value"].AsUUID()); break;
break; ////////////////////////////
//SOP properties, bool types
////////////////////////////
case SceneObjectPartSyncProperties.AllowedDrop:
case SceneObjectPartSyncProperties.IsAttachment:
case SceneObjectPartSyncProperties.PassTouches:
m_lastUpdateValue = (Object)(propertyData["Value"].AsBoolean());
//propertyData["Value"] = OSD.FromBoolean((bool)LastUpdateValue);
break;
//case SceneObjectPartProperties.AttachedPos: ////////////////////////////
//////////////////////////// //SOP properties, Vector3 types
//SOP properties, uint types ////////////////////////////
//////////////////////////// case SceneObjectPartSyncProperties.AngularVelocity:
case SceneObjectPartSyncProperties.AttachmentPoint: case SceneObjectPartSyncProperties.AttachedPos:
case SceneObjectPartSyncProperties.BaseMask: case SceneObjectPartSyncProperties.GroupPosition:
case SceneObjectPartSyncProperties.Category: case SceneObjectPartSyncProperties.OffsetPosition:
case SceneObjectPartSyncProperties.EveryoneMask: case SceneObjectPartSyncProperties.Scale:
case SceneObjectPartSyncProperties.GroupMask: case SceneObjectPartSyncProperties.SitTargetPosition:
case SceneObjectPartSyncProperties.InventorySerial: case SceneObjectPartSyncProperties.SitTargetPositionLL:
case SceneObjectPartSyncProperties.NextOwnerMask: case SceneObjectPartSyncProperties.SOP_Acceleration:
case SceneObjectPartSyncProperties.OwnerMask: case SceneObjectPartSyncProperties.Velocity:
//propertyData["Value"] = OSD.FromUInteger((uint)LastUpdateValue); //propertyData["Value"] = OSD.FromVector3((Vector3)LastUpdateValue);
m_lastUpdateValue = (Object)(propertyData["Value"].AsUInteger()); m_lastUpdateValue = (Object)(propertyData["Value"].AsVector3());
break; break;
//case SceneObjectPartProperties.BaseMask: ////////////////////////////
//case SceneObjectPartProperties.Category: //SOP properties, UUID types
////////////////////////////
case SceneObjectPartSyncProperties.AttachedAvatar:
case SceneObjectPartSyncProperties.CollisionSound:
case SceneObjectPartSyncProperties.CreatorID:
case SceneObjectPartSyncProperties.FolderID:
case SceneObjectPartSyncProperties.GroupID:
case SceneObjectPartSyncProperties.LastOwnerID:
case SceneObjectPartSyncProperties.OwnerID:
case SceneObjectPartSyncProperties.Sound:
//propertyData["Value"] = OSD.FromUUID((UUID)LastUpdateValue);
m_lastUpdateValue = (Object)(propertyData["Value"].AsUUID());
break;
//////////////////////////// //case SceneObjectPartProperties.AttachedPos:
//SOP properties, byte types ////////////////////////////
//////////////////////////// //SOP properties, uint types
case SceneObjectPartSyncProperties.ClickAction: ////////////////////////////
case SceneObjectPartSyncProperties.Material: case SceneObjectPartSyncProperties.AttachmentPoint:
case SceneObjectPartSyncProperties.ObjectSaleType: case SceneObjectPartSyncProperties.BaseMask:
case SceneObjectPartSyncProperties.UpdateFlag: case SceneObjectPartSyncProperties.Category:
//propertyData["Value"] = OSD.FromInteger((byte)LastUpdateValue); case SceneObjectPartSyncProperties.EveryoneMask:
byte pValue = (byte)(propertyData["Value"].AsInteger()); case SceneObjectPartSyncProperties.GroupMask:
m_lastUpdateValue = (Object)pValue; case SceneObjectPartSyncProperties.InventorySerial:
break; case SceneObjectPartSyncProperties.NextOwnerMask:
//case SceneObjectPartProperties.CollisionSound: case SceneObjectPartSyncProperties.OwnerMask:
//propertyData["Value"] = OSD.FromUInteger((uint)LastUpdateValue);
m_lastUpdateValue = (Object)(propertyData["Value"].AsUInteger());
break;
//////////////////////////// //case SceneObjectPartProperties.BaseMask:
//SOP properties, float types //case SceneObjectPartProperties.Category:
////////////////////////////
case SceneObjectPartSyncProperties.CollisionSoundVolume:
//propertyData["Value"] = OSD.FromReal((float)LastUpdateValue);
float csValue = (float)propertyData["Value"].AsReal();
m_lastUpdateValue = (Object)(csValue);
break;
//////////////////////////// ////////////////////////////
//SOP properties, Color(struct type) //SOP properties, byte types
//////////////////////////// ////////////////////////////
case SceneObjectPartSyncProperties.Color: case SceneObjectPartSyncProperties.ClickAction:
//propertyData["Value"] = OSD.FromString(PropertySerializer.SerializeColor((System.Drawing.Color)LastUpdateValue)); case SceneObjectPartSyncProperties.Material:
System.Drawing.Color cValue = PropertySerializer.DeSerializeColor(propertyData["Value"].AsString()); case SceneObjectPartSyncProperties.ObjectSaleType:
m_lastUpdateValue = (Object)cValue; case SceneObjectPartSyncProperties.UpdateFlag:
break; //propertyData["Value"] = OSD.FromInteger((byte)LastUpdateValue);
byte pValue = (byte)(propertyData["Value"].AsInteger());
m_lastUpdateValue = (Object)pValue;
break;
//case SceneObjectPartProperties.CollisionSound:
//////////////////////////// ////////////////////////////
//SOP properties, int types //SOP properties, float types
//////////////////////////// ////////////////////////////
case SceneObjectPartSyncProperties.CreationDate: case SceneObjectPartSyncProperties.CollisionSoundVolume:
case SceneObjectPartSyncProperties.LinkNum: //propertyData["Value"] = OSD.FromReal((float)LastUpdateValue);
case SceneObjectPartSyncProperties.OwnershipCost: float csValue = (float)propertyData["Value"].AsReal();
case SceneObjectPartSyncProperties.SalePrice: m_lastUpdateValue = (Object)(csValue);
case SceneObjectPartSyncProperties.ScriptAccessPin: break;
//propertyData["Value"] = OSD.FromInteger((int)LastUpdateValue);
m_lastUpdateValue = (Object)(propertyData["Value"].AsInteger());
break;
//////////////////////////// ////////////////////////////
//SOP properties, string types //SOP properties, Color(struct type)
//////////////////////////// ////////////////////////////
case SceneObjectPartSyncProperties.CreatorData: case SceneObjectPartSyncProperties.Color:
case SceneObjectPartSyncProperties.Description: //propertyData["Value"] = OSD.FromString(PropertySerializer.SerializeColor((System.Drawing.Color)LastUpdateValue));
case SceneObjectPartSyncProperties.MediaUrl: System.Drawing.Color cValue = PropertySerializer.DeSerializeColor(propertyData["Value"].AsString());
case SceneObjectPartSyncProperties.Name: m_lastUpdateValue = (Object)cValue;
case SceneObjectPartSyncProperties.SitName: break;
case SceneObjectPartSyncProperties.Text:
case SceneObjectPartSyncProperties.TouchName:
//propertyData["Value"] = OSD.FromString((string)LastUpdateValue);
m_lastUpdateValue = (Object)(propertyData["Value"].AsString());
break;
////////////////////////////
//SOP properties, byte[] types
////////////////////////////
case SceneObjectPartSyncProperties.ParticleSystem:
case SceneObjectPartSyncProperties.TextureAnimation:
//propertyData["Value"] = OSD.FromBinary((byte[])LastUpdateValue);
m_lastUpdateValue = (Object)(propertyData["Value"].AsBinary());
break;
//////////////////////////// ////////////////////////////
//SOP properties, Quaternion types //SOP properties, int types
//////////////////////////// ////////////////////////////
case SceneObjectPartSyncProperties.RotationOffset: case SceneObjectPartSyncProperties.CreationDate:
case SceneObjectPartSyncProperties.SitTargetOrientation: case SceneObjectPartSyncProperties.LinkNum:
case SceneObjectPartSyncProperties.SitTargetOrientationLL: case SceneObjectPartSyncProperties.OwnershipCost:
//propertyData["Value"] = OSD.FromQuaternion((Quaternion)LastUpdateValue); case SceneObjectPartSyncProperties.SalePrice:
m_lastUpdateValue = (Object)(propertyData["Value"].AsQuaternion()); case SceneObjectPartSyncProperties.ScriptAccessPin:
break; //propertyData["Value"] = OSD.FromInteger((int)LastUpdateValue);
m_lastUpdateValue = (Object)(propertyData["Value"].AsInteger());
break;
//////////////////////////////////// ////////////////////////////
//PhysActor properties, float type //SOP properties, string types
//////////////////////////////////// ////////////////////////////
case SceneObjectPartSyncProperties.Buoyancy: case SceneObjectPartSyncProperties.CreatorData:
//propertyData["Value"] = OSD.FromReal((float)LastUpdateValue); case SceneObjectPartSyncProperties.Description:
float bValue = (float)propertyData["Value"].AsReal(); case SceneObjectPartSyncProperties.MediaUrl:
m_lastUpdateValue = (Object)(bValue); case SceneObjectPartSyncProperties.Name:
break; case SceneObjectPartSyncProperties.SitName:
case SceneObjectPartSyncProperties.Text:
case SceneObjectPartSyncProperties.TouchName:
//propertyData["Value"] = OSD.FromString((string)LastUpdateValue);
m_lastUpdateValue = (Object)(propertyData["Value"].AsString());
break;
////////////////////////////
//SOP properties, byte[] types
////////////////////////////
case SceneObjectPartSyncProperties.ParticleSystem:
case SceneObjectPartSyncProperties.TextureAnimation:
//propertyData["Value"] = OSD.FromBinary((byte[])LastUpdateValue);
m_lastUpdateValue = (Object)(propertyData["Value"].AsBinary());
break;
//////////////////////////////////// ////////////////////////////
//PhysActor properties, bool type //SOP properties, Quaternion types
//////////////////////////////////// ////////////////////////////
case SceneObjectPartSyncProperties.Flying: case SceneObjectPartSyncProperties.RotationOffset:
case SceneObjectPartSyncProperties.IsColliding: case SceneObjectPartSyncProperties.SitTargetOrientation:
case SceneObjectPartSyncProperties.CollidingGround: case SceneObjectPartSyncProperties.SitTargetOrientationLL:
case SceneObjectPartSyncProperties.IsPhysical: //propertyData["Value"] = OSD.FromQuaternion((Quaternion)LastUpdateValue);
case SceneObjectPartSyncProperties.Kinematic: m_lastUpdateValue = (Object)(propertyData["Value"].AsQuaternion());
//propertyData["Value"] = OSD.FromBoolean((bool)LastUpdateValue); break;
m_lastUpdateValue = (Object)(propertyData["Value"].AsBoolean());
break;
//////////////////////////////////// ////////////////////////////////////
//PhysActor properties, Vector3 type //PhysActor properties, float type
//////////////////////////////////// ////////////////////////////////////
case SceneObjectPartSyncProperties.Force: case SceneObjectPartSyncProperties.Buoyancy:
case SceneObjectPartSyncProperties.PA_Acceleration: //propertyData["Value"] = OSD.FromReal((float)LastUpdateValue);
case SceneObjectPartSyncProperties.Position: float bValue = (float)propertyData["Value"].AsReal();
case SceneObjectPartSyncProperties.RotationalVelocity: m_lastUpdateValue = (Object)(bValue);
case SceneObjectPartSyncProperties.Size: break;
case SceneObjectPartSyncProperties.Torque:
//propertyData["Value"] = OSD.FromVector3((Vector3)LastUpdateValue);
m_lastUpdateValue = (Object)(propertyData["Value"].AsVector3());
break;
//////////////////////////////////// ////////////////////////////////////
//PhysActor properties, Quaternion type //PhysActor properties, bool type
//////////////////////////////////// ////////////////////////////////////
case SceneObjectPartSyncProperties.Orientation: case SceneObjectPartSyncProperties.Flying:
//propertyData["Value"] = OSD.FromQuaternion((Quaternion)LastUpdateValue); case SceneObjectPartSyncProperties.IsColliding:
m_lastUpdateValue = (Object)(propertyData["Value"].AsQuaternion()); case SceneObjectPartSyncProperties.CollidingGround:
break; case SceneObjectPartSyncProperties.IsPhysical:
case SceneObjectPartSyncProperties.Kinematic:
//propertyData["Value"] = OSD.FromBoolean((bool)LastUpdateValue);
m_lastUpdateValue = (Object)(propertyData["Value"].AsBoolean());
break;
/////////////////////// ////////////////////////////////////
//SOG properties //PhysActor properties, Vector3 type
/////////////////////// ////////////////////////////////////
case SceneObjectPartSyncProperties.IsSelected: case SceneObjectPartSyncProperties.Force:
//propertyData["Value"] = OSD.FromBoolean((bool)LastUpdateValue); case SceneObjectPartSyncProperties.PA_Acceleration:
m_lastUpdateValue = (Object)(propertyData["Value"].AsBoolean()); case SceneObjectPartSyncProperties.Position:
break; case SceneObjectPartSyncProperties.RotationalVelocity:
case SceneObjectPartSyncProperties.Size:
case SceneObjectPartSyncProperties.Torque:
//propertyData["Value"] = OSD.FromVector3((Vector3)LastUpdateValue);
m_lastUpdateValue = (Object)(propertyData["Value"].AsVector3());
break;
default: ////////////////////////////////////
m_log.WarnFormat("PrimSynInfo.PropertyToOSD -- no handler for property {0} ", m_property); //PhysActor properties, Quaternion type
break; ////////////////////////////////////
case SceneObjectPartSyncProperties.Orientation:
//propertyData["Value"] = OSD.FromQuaternion((Quaternion)LastUpdateValue);
m_lastUpdateValue = (Object)(propertyData["Value"].AsQuaternion());
break;
///////////////////////
//SOG properties
///////////////////////
case SceneObjectPartSyncProperties.IsSelected:
//propertyData["Value"] = OSD.FromBoolean((bool)LastUpdateValue);
m_lastUpdateValue = (Object)(propertyData["Value"].AsBoolean());
break;
default:
m_log.WarnFormat("PrimSynInfo.PropertyToOSD -- no handler for property {0} ", m_property);
break;
}
} }
} }
} }
public class PropertySerializer public class PropertySerializer
@ -6130,22 +6171,15 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
} }
data["primUUID"] = OSDMap.FromUUID(primUUID); data["primUUID"] = OSDMap.FromUUID(primUUID);
//OSDMap propertyData = new OSDMap();
//data["propertyData"] = propertyData;
//If SceneObjectPartProperties.FullUpdate is in updatedProperties, //If SceneObjectPartProperties.FullUpdate is in updatedProperties,
//convert it to the full list of all properties //convert it to the full list of all properties
HashSet<SceneObjectPartSyncProperties> propertiesToEncoded = updatedProperties; HashSet<SceneObjectPartSyncProperties> propertiesToEncoded = updatedProperties;
if (updatedProperties.Contains(SceneObjectPartSyncProperties.FullUpdate)) if (updatedProperties.Contains(SceneObjectPartSyncProperties.FullUpdate))
{ {
propertiesToEncoded = SceneObjectPart.GetAllPrimProperties(); propertiesToEncoded = SceneObjectPart.GetAllPrimProperties();
} }
//foreach (SceneObjectPartProperties property in propertiesToEncoded)
//{
//propertyData.Add(property.ToString(), m_primsInSync[primUUID].EncodePropertiesSyncInfo(propertiesToEncoded));
//}
OSDMap propertyData = m_primsInSync[primUUID].EncodePropertiesSyncInfo(propertiesToEncoded); OSDMap propertyData = m_primsInSync[primUUID].EncodePropertiesSyncInfo(propertiesToEncoded);
data["propertyData"] = propertyData; data["propertyData"] = propertyData;
@ -6165,7 +6199,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
PrimSyncInfo primSynInfo = new PrimSyncInfo(primUUID, propertyData); PrimSyncInfo primSynInfo = new PrimSyncInfo(primUUID, propertyData);
return primSynInfo; return primSynInfo;
//InsertPrimSyncInfo(primUUID, );
} }
/// <summary> /// <summary>

6
OpenSim/Region/Framework/Interfaces/IRegionSyncModule.cs
View File

@ -74,10 +74,16 @@ namespace OpenSim.Region.Framework.Interfaces
void ProcessAndEnqueuePrimUpdatesByLocal(SceneObjectPart part, List<SceneObjectPartSyncProperties> updatedProperties); void ProcessAndEnqueuePrimUpdatesByLocal(SceneObjectPart part, List<SceneObjectPartSyncProperties> updatedProperties);
void SyncOutPrimUpdates(); void SyncOutPrimUpdates();
//Legacy calls in Bucket sync'ing
//The folloiwng calls deal with object updates, and will insert each update into an outgoing queue of each SyncConnector //The folloiwng calls deal with object updates, and will insert each update into an outgoing queue of each SyncConnector
//void SendSceneUpdates(); //void SendSceneUpdates();
void SendNewObject(SceneObjectGroup sog); void SendNewObject(SceneObjectGroup sog);
void SendDeleteObject(SceneObjectGroup sog, bool softDelete); void SendDeleteObject(SceneObjectGroup sog, bool softDelete);
//New functions for per property sync'ing
void SyncNewObject(SceneObjectGroup sog);
void SyncDeleteObject(SceneObjectGroup sog, bool softDelete);
void SendLinkObject(SceneObjectGroup linkedGroup, SceneObjectPart root, List<SceneObjectPart> children); void SendLinkObject(SceneObjectGroup linkedGroup, SceneObjectPart root, List<SceneObjectPart> children);
void SendDeLinkObject(List<SceneObjectPart> prims, List<SceneObjectGroup> beforeDelinkGroups, List<SceneObjectGroup> afterDelinkGroups); void SendDeLinkObject(List<SceneObjectPart> prims, List<SceneObjectGroup> beforeDelinkGroups, List<SceneObjectGroup> afterDelinkGroups);

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

@ -429,10 +429,11 @@ namespace OpenSim.Region.Framework.Scenes
SceneObjectGroupsByLocalPartID[part.LocalId] = sceneObject; SceneObjectGroupsByLocalPartID[part.LocalId] = sceneObject;
} }
//SYMMETRIC SYNC: sending NewObject event, and sending it before calling ScheduleGroupForFullUpdate //DSG SYNC: sending NewObject event, and sending it before calling ScheduleGroupForFullUpdate
if (m_parentScene.RegionSyncModule != null) if (m_parentScene.RegionSyncModule != null)
{ {
m_parentScene.RegionSyncModule.SendNewObject(sceneObject); //m_parentScene.RegionSyncModule.SendNewObject(sceneObject);
m_parentScene.RegionSyncModule.SyncNewObject(sceneObject);
} }
if (sendClientUpdates) if (sendClientUpdates)