Merge branch 'dev' into syncstats
Conflicts: OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.csdsg
Robert Adams
commit
d70deaaa64
|
|
@ -212,6 +212,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
|
|||
{
|
||||
lock (m_primUpdateLocks[bucketName])
|
||||
{
|
||||
//m_log.Debug("Queueing to bucket " + bucketName + " with part " + part.Name + ", " + part.UUID);
|
||||
m_primUpdates[bucketName][part.UUID] = part;
|
||||
}
|
||||
}
|
||||
|
|
@ -255,6 +256,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
|
|||
{
|
||||
if (m_primUpdates[bucketName].Count > 0)
|
||||
{
|
||||
//m_log.Debug(m_primUpdates[bucketName].Count + " updated parts in bucket " + bucketName);
|
||||
lock (m_primUpdateLocks[bucketName])
|
||||
{
|
||||
updated = true;
|
||||
|
|
@ -309,6 +311,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
|
|||
}
|
||||
}
|
||||
* */
|
||||
//m_log.Debug(LogHeader + " calling update sender for bucket " + bucketName);
|
||||
m_primUpdatesPerBucketSender[bucketName](bucketName, primUpdates[bucketName]);
|
||||
}
|
||||
}
|
||||
|
|
@ -383,6 +386,24 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Send a sync message to add the given object to other sync nodes.
|
||||
/// </summary>
|
||||
/// <param name="sog"></param>
|
||||
public void SendNewObject(SceneObjectGroup sog)
|
||||
{
|
||||
if (!IsSyncingWithOtherActors())
|
||||
{
|
||||
//no SyncConnector connected. Do nothing.
|
||||
return;
|
||||
}
|
||||
m_log.DebugFormat(LogHeader + "SendNewObject called for object {0}, {1}", sog.Name, sog.UUID);
|
||||
|
||||
string sogxml = SceneObjectSerializer.ToXml2Format(sog);
|
||||
SymmetricSyncMessage rsm = new SymmetricSyncMessage(SymmetricSyncMessage.MsgType.NewObject, sogxml);
|
||||
SendObjectUpdateToRelevantSyncConnectors(sog, rsm);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Send a sync message to remove the given objects in all connected actors.
|
||||
/// UUID is used for identified a removed object. This function now should
|
||||
|
|
@ -442,6 +463,9 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
|
|||
partNum++;
|
||||
}
|
||||
|
||||
m_log.Debug(LogHeader + " to SendLinkObject to link " + children.Count + " parts to " + root.Name);
|
||||
m_log.Debug("LinkedObject: "+sogxml);
|
||||
|
||||
SymmetricSyncMessage rsm = new SymmetricSyncMessage(SymmetricSyncMessage.MsgType.LinkObject, OSDParser.SerializeJsonString(data));
|
||||
SendObjectUpdateToRelevantSyncConnectors(linkedGroup, rsm);
|
||||
}
|
||||
|
|
@ -600,10 +624,14 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
|
|||
//for debugging purpose
|
||||
Command cmdSyncDebug = new Command("debug", CommandIntentions.COMMAND_HAZARDOUS, SyncDebug, "Trigger some debugging functions");
|
||||
|
||||
//for sync state comparison,
|
||||
Command cmdSyncStateReport = new Command("state", CommandIntentions.COMMAND_HAZARDOUS, SyncStateReport, "Trigger synchronization state comparision functions");
|
||||
|
||||
m_commander.RegisterCommand("start", cmdSyncStart);
|
||||
m_commander.RegisterCommand("stop", cmdSyncStop);
|
||||
m_commander.RegisterCommand("status", cmdSyncStatus);
|
||||
m_commander.RegisterCommand("debug", cmdSyncDebug);
|
||||
m_commander.RegisterCommand("state", cmdSyncStateReport);
|
||||
|
||||
lock (m_scene)
|
||||
{
|
||||
|
|
@ -738,14 +766,10 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
|
|||
{
|
||||
updatedPart.UpdateTaintedBucketSyncInfo(bucketName, DateTime.Now.Ticks);
|
||||
|
||||
Physics.Manager.PhysicsActor pa = updatedPart.PhysActor;
|
||||
if (pa == null)
|
||||
return;
|
||||
|
||||
OSDMap data = new OSDMap();
|
||||
|
||||
// data["UUID"] = OSD.FromUUID(updatedPart.UUID);
|
||||
data["UUID"] = OSD.FromUUID(pa.UUID);
|
||||
data["UUID"] = OSD.FromUUID(updatedPart.UUID);
|
||||
//data["UUID"] = OSD.FromUUID(pa.UUID);
|
||||
data["Bucket"] = OSD.FromString(bucketName);
|
||||
|
||||
data["GroupPosition"] = OSD.FromVector3(updatedPart.GroupPosition);
|
||||
|
|
@ -753,6 +777,11 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
|
|||
data["Scale"] = OSD.FromVector3(updatedPart.Scale);
|
||||
data["AngularVelocity"] = OSD.FromVector3(updatedPart.AngularVelocity);
|
||||
data["RotationOffset"] = OSD.FromQuaternion(updatedPart.RotationOffset);
|
||||
|
||||
Physics.Manager.PhysicsActor pa = updatedPart.PhysActor;
|
||||
if (pa != null)
|
||||
{
|
||||
|
||||
data["Size"] = OSD.FromVector3(pa.Size);
|
||||
data["Position"] = OSD.FromVector3(pa.Position);
|
||||
data["Force"] = OSD.FromVector3(pa.Force);
|
||||
|
|
@ -767,10 +796,13 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
|
|||
data["Buoyancy"] = OSD.FromReal(pa.Buoyancy);
|
||||
data["CollidingGround"] = OSD.FromBoolean(pa.CollidingGround);
|
||||
data["IsColliding"] = OSD.FromBoolean(pa.IsColliding);
|
||||
}
|
||||
|
||||
data["LastUpdateTimeStamp"] = OSD.FromLong(updatedPart.BucketSyncInfoList[bucketName].LastUpdateTimeStamp);
|
||||
data["LastUpdateActorID"] = OSD.FromString(updatedPart.BucketSyncInfoList[bucketName].LastUpdateActorID);
|
||||
|
||||
//m_log.Debug(LogHeader + " Send out Physics Bucket updates for " + updatedPart.Name + ". GroupPosition: " + updatedPart.GroupPosition.ToString());
|
||||
|
||||
SymmetricSyncMessage syncMsg = new SymmetricSyncMessage(SymmetricSyncMessage.MsgType.UpdatedBucketProperties, OSDParser.SerializeJsonString(data));
|
||||
//m_log.DebugFormat("{0}: PhysBucketSender for {1}, pos={2}", LogHeader, updatedPart.UUID.ToString(), pa.Position.ToString());
|
||||
lock (m_stats) m_statPhysBucketOut++;
|
||||
|
|
@ -846,6 +878,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
|
|||
{
|
||||
//string sogxml = SceneObjectSerializer.ToXml2Format(sog);
|
||||
//SymmetricSyncMessage syncMsg = new SymmetricSyncMessage(SymmetricSyncMessage.MsgType.UpdatedObject, sogxml);
|
||||
|
||||
connector.EnqueueOutgoingUpdate(sog.UUID, syncMsg.ToBytes());
|
||||
}
|
||||
}
|
||||
|
|
@ -1192,6 +1225,28 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
|
|||
});
|
||||
}
|
||||
|
||||
private void SyncStateReport(Object[] args)
|
||||
{
|
||||
//Preliminary implementation
|
||||
EntityBase[] entities = m_scene.GetEntities();
|
||||
List<SceneObjectGroup> sogList = new List<SceneObjectGroup>();
|
||||
foreach (EntityBase entity in entities)
|
||||
{
|
||||
if (entity is SceneObjectGroup)
|
||||
{
|
||||
sogList.Add((SceneObjectGroup)entity);
|
||||
}
|
||||
}
|
||||
|
||||
int primCount = 0;
|
||||
foreach (SceneObjectGroup sog in sogList)
|
||||
{
|
||||
primCount += sog.Parts.Length;
|
||||
}
|
||||
|
||||
m_log.WarnFormat("SyncStateReport -- Object count: {0}, Prim Count {1} ", sogList.Count, primCount);
|
||||
}
|
||||
|
||||
private void SyncDebug(Object[] args)
|
||||
{
|
||||
if (m_scene != null)
|
||||
|
|
@ -1436,6 +1491,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
|
|||
return;
|
||||
}
|
||||
case SymmetricSyncMessage.MsgType.NewObject:
|
||||
HandleAddNewObject(msg, senderActorID);
|
||||
break;
|
||||
case SymmetricSyncMessage.MsgType.UpdatedObject:
|
||||
{
|
||||
HandleAddOrUpdateObjectBySynchronization(msg, senderActorID);
|
||||
|
|
@ -1503,12 +1560,32 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
|
|||
m_log.Debug(LogHeader + ": Synchronized terrain");
|
||||
}
|
||||
|
||||
private void HandleAddNewObject(SymmetricSyncMessage msg, string senderActorID)
|
||||
{
|
||||
string sogxml = Encoding.ASCII.GetString(msg.Data, 0, msg.Length);
|
||||
SceneObjectGroup sog = SceneObjectSerializer.FromXml2Format(sogxml);
|
||||
|
||||
m_log.DebugFormat("{0}: received NewObject sync message from {1}, for object {1}, {2}", LogHeader, senderActorID, sog.Name, sog.UUID);
|
||||
|
||||
Scene.ObjectUpdateResult updateResult = m_scene.AddOrUpdateObjectBySynchronization(sog);
|
||||
}
|
||||
|
||||
private void HandleAddOrUpdateObjectBySynchronization(SymmetricSyncMessage msg, string senderActorID)
|
||||
{
|
||||
string sogxml = Encoding.ASCII.GetString(msg.Data, 0, msg.Length);
|
||||
SceneObjectGroup sog = SceneObjectSerializer.FromXml2Format(sogxml);
|
||||
lock (m_stats) m_statSOGBucketIn++;
|
||||
|
||||
//SYNC DEBUG
|
||||
/*
|
||||
string partnames = "";
|
||||
foreach (SceneObjectPart part in sog.Parts)
|
||||
{
|
||||
partnames += "(" + part.Name + ", " + part.UUID + ")";
|
||||
}
|
||||
m_log.Debug(LogHeader+" received "+msg.Type.ToString()+" from "+senderActorID+" about obj "+sog.Name+", "+sog.UUID+"; parts -- "+partnames);
|
||||
* */
|
||||
|
||||
if (sog.IsDeleted)
|
||||
{
|
||||
SymmetricSyncMessage.HandleTrivial(LogHeader, msg, String.Format("Ignoring update on deleted object, UUID: {0}.", sog.UUID));
|
||||
|
|
@ -1633,6 +1710,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
|
|||
return data;
|
||||
}
|
||||
|
||||
/*
|
||||
private void HandleAddNewObject(SceneObjectGroup sog)
|
||||
{
|
||||
//RegionSyncModule only add object to SceneGraph. Any actor specific actions will be implemented
|
||||
|
|
@ -1644,6 +1722,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
|
|||
m_log.Debug(LogHeader + ": added obj " + sog.UUID);
|
||||
}
|
||||
}
|
||||
* */
|
||||
|
||||
private void HandleRemovedObject(SymmetricSyncMessage msg, string senderActorID)
|
||||
{
|
||||
|
|
@ -1687,6 +1766,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
|
|||
|
||||
private void HandleLinkObject(SymmetricSyncMessage msg, string senderActorID)
|
||||
{
|
||||
|
||||
// Get the data from message and error check
|
||||
OSDMap data = DeserializeMessage(msg);
|
||||
if (data == null)
|
||||
|
|
@ -1708,6 +1788,9 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
|
|||
childrenIDs.Add(data[partTempID].AsUUID());
|
||||
}
|
||||
|
||||
m_log.Debug(LogHeader + " received LinkObject from " + senderActorID);
|
||||
//m_log.Debug("LinkedObject: " + sogxml);
|
||||
|
||||
m_scene.LinkObjectBySync(linkedGroup, rootID, childrenIDs);
|
||||
|
||||
//if this is a relay node, forwards the event
|
||||
|
|
@ -2006,7 +2089,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
|
|||
/// <param name="data">OSDMap data of event args</param>
|
||||
private void HandleRemoteEvent_OnObjectGrab(string actorID, ulong evSeqNum, OSDMap data)
|
||||
{
|
||||
m_log.Debug(LogHeader + ", " + m_actorID + ": received GrabObject from " + actorID + ", seq " + evSeqNum);
|
||||
// m_log.Debug(LogHeader + ", " + m_actorID + ": received GrabObject from " + actorID + ", seq " + evSeqNum);
|
||||
|
||||
|
||||
UUID agentID = data["agentID"].AsUUID();
|
||||
|
|
@ -2043,7 +2126,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
|
|||
|
||||
private void HandleRemoteEvent_OnObjectGrabbing(string actorID, ulong evSeqNum, OSDMap data)
|
||||
{
|
||||
m_log.Debug(LogHeader + ", " + m_actorID + ": received GrabObject from " + actorID + ", seq " + evSeqNum);
|
||||
// m_log.Debug(LogHeader + ", " + m_actorID + ": received GrabObject from " + actorID + ", seq " + evSeqNum);
|
||||
|
||||
UUID agentID = data["agentID"].AsUUID();
|
||||
UUID primID = data["primID"].AsUUID();
|
||||
|
|
@ -2080,7 +2163,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
|
|||
|
||||
private void HandleRemoteEvent_OnObjectDeGrab(string actorID, ulong evSeqNum, OSDMap data)
|
||||
{
|
||||
m_log.Debug(LogHeader + ", " + m_actorID + ": received GrabObject from " + actorID + ", seq " + evSeqNum);
|
||||
// m_log.Debug(LogHeader + ", " + m_actorID + ": received GrabObject from " + actorID + ", seq " + evSeqNum);
|
||||
|
||||
UUID agentID = data["agentID"].AsUUID();
|
||||
UUID primID = data["primID"].AsUUID();
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@ namespace OpenSim.Region.Framework.Interfaces
|
|||
|
||||
//The folloiwng calls deal with object updates, and will insert each update into an outgoing queue of each SyncConnector
|
||||
void SendSceneUpdates();
|
||||
void SendNewObject(SceneObjectGroup sog);
|
||||
void SendDeleteObject(SceneObjectGroup sog, bool softDelete);
|
||||
void SendLinkObject(SceneObjectGroup linkedGroup, SceneObjectPart root, List<SceneObjectPart> children);
|
||||
void SendDeLinkObject(List<SceneObjectPart> prims, List<SceneObjectGroup> beforeDelinkGroups, List<SceneObjectGroup> afterDelinkGroups);
|
||||
|
|
|
|||
|
|
@ -333,11 +333,13 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
ArrayList errors = new ArrayList();
|
||||
|
||||
//In the old async model, this function is supposed to be executed only on a remote script engine, not an authorative Scene
|
||||
/*
|
||||
if (RegionSyncModule==null && !IsSyncedScriptEngine())
|
||||
{
|
||||
m_log.Warn("This is not the script engine. Should not have received OnUpdateScript event.");
|
||||
return errors;
|
||||
}
|
||||
* */
|
||||
SceneObjectPart part = GetSceneObjectPart(primID);
|
||||
SceneObjectGroup group = part.ParentGroup;
|
||||
if (isScriptRunning)
|
||||
|
|
@ -2195,6 +2197,13 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
AddNewSceneObject(group, true, pos, rot, vel);
|
||||
|
||||
//SYNC DEBUG
|
||||
string partnames = "";
|
||||
foreach (SceneObjectPart part in group.Parts){
|
||||
partnames += "(" + part.Name + ", " + part.UUID + ")";
|
||||
}
|
||||
m_log.DebugFormat("[SCENE] RezObject {0} with InvItem name {1} at pos {2} with parts {3}", group.UUID.ToString(), item.Name, group.RootPart.GroupPosition.ToString(), partnames);
|
||||
|
||||
// We can only call this after adding the scene object, since the scene object references the scene
|
||||
// to find out if scripts should be activated at all.
|
||||
group.CreateScriptInstances(param, true, DefaultScriptEngine, 3);
|
||||
|
|
|
|||
|
|
@ -509,6 +509,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
return IsSyncedServer();
|
||||
}
|
||||
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//RA: Physics Engine
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -543,12 +544,15 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
//!!! Obsolete function. Shouldn't be used anymore.
|
||||
|
||||
//This function should only be called by an actor who's local Scene is just a cache of the authorative Scene.
|
||||
//If the object already exists, use the new copy to replace it.
|
||||
//Return true if added, false if just updated
|
||||
public bool AddOrUpdateObjectInLocalScene(SceneObjectGroup sog, bool debugWithViewer)
|
||||
{
|
||||
return m_sceneGraph.AddOrUpdateObjectInScene(sog, debugWithViewer);
|
||||
return false;
|
||||
//return m_sceneGraph.AddOrUpdateObjectInScene(sog, debugWithViewer);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -790,11 +794,14 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
continue;
|
||||
}
|
||||
|
||||
m_log.Debug("to link part " + part.DebugObjectPartProperties());
|
||||
//m_log.Debug("to link part " + part.DebugObjectPartProperties());
|
||||
m_log.Debug("to link part " + part.Name + "," + part.UUID + "; its SOG has " + part.ParentGroup.Parts + " parts");
|
||||
|
||||
children.Add(part);
|
||||
}
|
||||
|
||||
//m_log.Debug("to link " + children.Count + " parts with " + root.Name);
|
||||
|
||||
//Leverage the LinkObject implementation to get the book keeping of Group and Parts relations right
|
||||
m_sceneGraph.LinkObjectsBySync(root, children);
|
||||
|
||||
|
|
|
|||
|
|
@ -383,10 +383,6 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
sceneObject.AttachToScene(m_parentScene);
|
||||
|
||||
if (sendClientUpdates)
|
||||
//sceneObject.ScheduleGroupForFullUpdate();
|
||||
sceneObject.ScheduleGroupForFullUpdate(new List<SceneObjectPartProperties>(){SceneObjectPartProperties.None});
|
||||
|
||||
Entities.Add(sceneObject);
|
||||
|
||||
if (attachToBackup)
|
||||
|
|
@ -409,6 +405,16 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
SceneObjectGroupsByLocalID[part.LocalId] = sceneObject;
|
||||
}
|
||||
|
||||
//SYMMETRIC SYNC: sending NewObject event, and sending it before calling ScheduleGroupForFullUpdate
|
||||
if (m_parentScene.RegionSyncModule != null)
|
||||
{
|
||||
m_parentScene.RegionSyncModule.SendNewObject(sceneObject);
|
||||
}
|
||||
|
||||
if (sendClientUpdates)
|
||||
//sceneObject.ScheduleGroupForFullUpdate();
|
||||
sceneObject.ScheduleGroupForFullUpdate(new List<SceneObjectPartProperties>() { SceneObjectPartProperties.None });
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -468,7 +474,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
lock (m_updateList)
|
||||
{
|
||||
m_updateList[obj.UUID] = obj;
|
||||
//m_log.Debug("added " + obj.UUID + " to m_updateList");
|
||||
//m_log.Debug("added " + obj.Name+","+ obj.UUID + " to m_updateList");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -489,12 +495,12 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
{
|
||||
updates = new List<SceneObjectGroup>(m_updateList.Values);
|
||||
|
||||
/*
|
||||
|
||||
if (updates.Count > 0)
|
||||
{
|
||||
m_log.Debug("SceneGraph: " + updates.Count + " objects to send updates for");
|
||||
//m_log.Debug("SceneGraph.UpdateObjectGroups: " + updates.Count + " objects to send updates for");
|
||||
}
|
||||
* */
|
||||
|
||||
|
||||
|
||||
m_updateList.Clear();
|
||||
|
|
@ -1948,6 +1954,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
//Return false if the entity with the UUID is not a SceneObjectGroup,
|
||||
//otherwise, return true.
|
||||
/*
|
||||
protected internal bool AddOrUpdateObjectInScene(SceneObjectGroup updatedSog, bool debugWithViewer)
|
||||
{
|
||||
UUID sogID = updatedSog.UUID;
|
||||
|
|
@ -1989,6 +1996,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
}
|
||||
|
||||
}
|
||||
* */
|
||||
|
||||
#endregion // REGION SYNC
|
||||
|
||||
|
|
@ -2018,7 +2026,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
}
|
||||
else
|
||||
{
|
||||
m_log.Debug("AddSceneObjectByStateSynch to be called");
|
||||
m_log.Debug(updatedSog.Name+" "+updatedSog.UUID+" not found in Entities list. Need to add");
|
||||
AddSceneObjectByStateSynch(updatedSog);
|
||||
updateResult = Scene.ObjectUpdateResult.New;
|
||||
}
|
||||
|
|
@ -2062,6 +2070,8 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
}
|
||||
m_numPrim += children.Length;
|
||||
|
||||
m_log.Debug("Attached obj " + sceneObject.Name + "," + sceneObject.UUID + " to Scene");
|
||||
|
||||
sceneObject.AttachToScene(m_parentScene);
|
||||
|
||||
//Take some special care of the case of this object being an attachment
|
||||
|
|
|
|||
|
|
@ -5504,16 +5504,32 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
//buckets may not be filled at all in "updatedPart".
|
||||
private void PhysicsBucketUpdateProcessor(Object updatedPartO, string bucketName)
|
||||
{
|
||||
SceneObjectPart localPart = this;
|
||||
|
||||
if (updatedPartO is SceneObjectPart)
|
||||
{
|
||||
SceneObjectPart updatedPart = (SceneObjectPart)updatedPartO;
|
||||
|
||||
localPart.GroupPosition = updatedPart.GroupPosition;
|
||||
localPart.OffsetPosition = updatedPart.OffsetPosition;
|
||||
localPart.Scale = updatedPart.Scale;
|
||||
localPart.Velocity = updatedPart.Velocity;
|
||||
localPart.AngularVelocity = updatedPart.AngularVelocity;
|
||||
localPart.RotationOffset = updatedPart.RotationOffset;
|
||||
return;
|
||||
}
|
||||
|
||||
if (!(updatedPartO is OSDMap)) return;
|
||||
OSDMap data = (OSDMap)updatedPartO;
|
||||
|
||||
//If needed, we could define new set functions for these properties, and cast this SOP to SOPBase to
|
||||
//invoke the set functions in SOPBase
|
||||
//SceneObjectPartBase localPart = (SceneObjectPartBase)this;
|
||||
SceneObjectPart localPart = this;
|
||||
//SceneObjectPart localPart = this;
|
||||
PhysicsActor pa = localPart.PhysActor;
|
||||
|
||||
// m_log.DebugFormat("{0}: PhysicsBucketUpdateProcessor. pos={1}", "[SCENE OBJECT PART]", data["Position"].AsVector3().ToString());
|
||||
//m_log.Debug("Received Physics Bucket updates for " + localPart.Name + ". GroupPosition: " + data["GroupPosition"].AsVector3().ToString()
|
||||
// + ", Position = " + data["Position"].AsVector3().ToString());
|
||||
|
||||
lock (m_bucketUpdateLocks[bucketName])
|
||||
{
|
||||
|
|
@ -5761,6 +5777,8 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
//Second, if need to update local properties, call each bucket's update process
|
||||
if (m_bucketUpdateProcessors.ContainsKey(bucketName))
|
||||
{
|
||||
//m_log.Debug("Update properties in " + bucketName + " buckets");
|
||||
|
||||
m_bucketUpdateProcessors[bucketName](updatedPart, bucketName);
|
||||
partUpdateResult = Scene.ObjectUpdateResult.Updated;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1353,7 +1353,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
SetScale(m_host, scale);
|
||||
}
|
||||
|
||||
//REGION SYNC TOUCHED -- set via sync'ing with remote Scene
|
||||
protected void SetScale(SceneObjectPart part, LSL_Vector scale)
|
||||
{
|
||||
// TODO: this needs to trigger a persistance save as well
|
||||
|
|
@ -1383,9 +1382,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
if (scale.z > World.m_maxNonphys)
|
||||
scale.z = World.m_maxNonphys;
|
||||
|
||||
if (World.ScriptEngineToSceneConnectorModule==null)
|
||||
{
|
||||
//If Script engine is local to Scene (REGION SYNC mode=server, and XEngine enabled=true, and no remote Script Engine connected)
|
||||
Vector3 tmp = part.Scale;
|
||||
tmp.X = (float)scale.x;
|
||||
tmp.Y = (float)scale.y;
|
||||
|
|
@ -1393,12 +1389,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
part.Scale = tmp;
|
||||
part.SendFullUpdateToAllClients();
|
||||
}
|
||||
else
|
||||
{
|
||||
//set via sync'ing with remote Scene
|
||||
World.ScriptEngineToSceneConnectorModule.SendSetPrimProperties(part.ParentGroup.LocX, part.ParentGroup.LocY, part.UUID, "scale", scale);
|
||||
}
|
||||
}
|
||||
|
||||
public LSL_Vector llGetScale()
|
||||
{
|
||||
|
|
@ -1416,7 +1406,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
return;
|
||||
}
|
||||
|
||||
//REGION SYNC TOUCHED -- set via sync'ing with remote Scene
|
||||
public void llSetColor(LSL_Vector color, int face)
|
||||
{
|
||||
m_host.AddScriptLPS(1);
|
||||
|
|
@ -1424,23 +1413,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
if (face == ScriptBaseClass.ALL_SIDES)
|
||||
face = SceneObjectPart.ALL_SIDES;
|
||||
|
||||
// REGION SYNC
|
||||
if (World.ScriptEngineToSceneConnectorModule == null)
|
||||
{
|
||||
m_host.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face);
|
||||
}
|
||||
else
|
||||
{
|
||||
object[] valParams = new object[2];
|
||||
//valParams[0] = (object)color.x;
|
||||
//valParams[1] = (object)color.y;
|
||||
//valParams[2] = (object)color.z;
|
||||
Vector3 vcolor = new Vector3((float)color.x, (float)color.y, (float)color.z);
|
||||
valParams[0] = (object)vcolor;
|
||||
valParams[1] = (object)face;
|
||||
World.ScriptEngineToSceneConnectorModule.SendSetPrimProperties(m_host.ParentGroup.LocX, m_host.ParentGroup.LocY, m_host.UUID, "color", (object)valParams);
|
||||
}
|
||||
}
|
||||
|
||||
public void SetTexGen(SceneObjectPart part, int face,int style)
|
||||
{
|
||||
|
|
@ -2766,7 +2740,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
ScriptSleep(100);
|
||||
}
|
||||
|
||||
//REGION SYNC TOUCHED -- set via sync'ing with remote Scene
|
||||
public void llRezAtRoot(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param)
|
||||
{
|
||||
m_host.AddScriptLPS(1);
|
||||
|
|
@ -2778,10 +2751,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
if (dist > m_ScriptDistanceFactor * 10.0f)
|
||||
return;
|
||||
|
||||
if (World.ScriptEngineToSceneConnectorModule == null)
|
||||
{
|
||||
//if Scene co-locates with Script Engine
|
||||
|
||||
TaskInventoryDictionary partInventory = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
|
||||
|
||||
foreach (KeyValuePair<UUID, TaskInventoryItem> inv in partInventory)
|
||||
|
|
@ -2836,26 +2805,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
|
||||
llSay(0, "Could not find object " + inventory);
|
||||
}
|
||||
else
|
||||
{
|
||||
//Scene does not co-locate with Script Engine
|
||||
Vector3 llpos = new Vector3((float)pos.x, (float)pos.y, (float)pos.z);
|
||||
Vector3 llvel = new Vector3((float)vel.x, (float)vel.y, (float)vel.z);
|
||||
Quaternion llrot = Rot2Quaternion(rot);
|
||||
object[] valParams = new object[5];
|
||||
valParams[0] = (object)inventory;
|
||||
valParams[1] = (object)llpos;
|
||||
valParams[2] = (object)llpos;
|
||||
valParams[3] = (object)llrot;
|
||||
valParams[4] = (object)param;
|
||||
//we borrow the implementation SendSetPrimProperties to send the message to Scene
|
||||
World.ScriptEngineToSceneConnectorModule.SendSetPrimProperties(m_host.ParentGroup.LocX, m_host.ParentGroup.LocY, m_host.UUID, "object_rez", (object)valParams);
|
||||
|
||||
// Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay)
|
||||
//ScriptSleep((int)((groupmass * velmag) / 10));
|
||||
ScriptSleep(100);
|
||||
}
|
||||
}
|
||||
|
||||
public void llRezObject(string inventory, LSL_Vector pos, LSL_Vector vel, LSL_Rotation rot, int param)
|
||||
{
|
||||
|
|
@ -3412,8 +3362,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
item = m_host.TaskInventory[invItemID];
|
||||
}
|
||||
|
||||
if (agentID == UUID.Zero || perm == 0) // Releasing permissions
|
||||
{
|
||||
//if (agentID == UUID.Zero || perm == 0) // Releasing permissions
|
||||
//{
|
||||
llReleaseControls();
|
||||
|
||||
item.PermsGranter = UUID.Zero;
|
||||
|
|
@ -3425,7 +3375,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
new DetectParams[0]));
|
||||
|
||||
return;
|
||||
}
|
||||
//}
|
||||
|
||||
if (item.PermsGranter != agentID || (perm & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
|
||||
llReleaseControls();
|
||||
|
|
@ -3635,6 +3585,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
return; // Fail silently if attached
|
||||
SceneObjectGroup parentPrim = null, childPrim = null;
|
||||
|
||||
//SYEMMETRIC SYNC
|
||||
List<SceneObjectPart> children = new List<SceneObjectPart>();
|
||||
|
||||
if (targetPart != null)
|
||||
{
|
||||
if (parent != 0) {
|
||||
|
|
@ -3646,6 +3599,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
parentPrim = targetPart.ParentGroup;
|
||||
childPrim = m_host.ParentGroup;
|
||||
}
|
||||
children.Add(childPrim.RootPart);
|
||||
|
||||
// byte uf = childPrim.RootPart.UpdateFlag;
|
||||
childPrim.RootPart.UpdateFlag = 0;
|
||||
parentPrim.LinkToGroup(childPrim);
|
||||
|
|
@ -3664,7 +3619,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
{
|
||||
//Tell other actors to link the SceneObjectParts together as a new group.
|
||||
//parentGroup.SyncInfoUpdate();
|
||||
World.RegionSyncModule.SendLinkObject(parentPrim, parentPrim.RootPart, new List<SceneObjectPart>(childPrim.Parts));
|
||||
World.RegionSyncModule.SendLinkObject(parentPrim, parentPrim.RootPart, children);
|
||||
}
|
||||
m_host.ScheduleFullUpdate(new List<SceneObjectPartProperties>(){SceneObjectPartProperties.None}); //SendLinkObject above will synchronize the link operation, no need to taint updates here
|
||||
//end of SYMMETRIC SYNC
|
||||
|
|
|
|||
Loading…
Reference in New Issue