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

RegionSyncServer and RegionSyncClient will not trigger RezAttachment anymore. Attachments 

are synced via object sync protocol.
dsg
Huaiyu (Kitty) Liu 2011-02-18 16:08:12 -08:00
parent 10a41ad5b5
commit 1d2a25689a
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs
View File

@ -395,7 +395,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
RegionSyncAvatar av = new RegionSyncAvatar(m_scene, agentID, first, last, startPos); RegionSyncAvatar av = new RegionSyncAvatar(m_scene, agentID, first, last, startPos);
m_remoteAvatars.Add(agentID, av); m_remoteAvatars.Add(agentID, av);
m_scene.AddNewClient(av); //m_scene.AddNewClient(av);
m_scene.AddNewClient2(av, true, false);
m_scene.TryGetScenePresence(agentID, out sp); m_scene.TryGetScenePresence(agentID, out sp);
if (sp == null) if (sp == null)
{ {

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

@ -374,7 +374,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
} }
m_syncedAvatars.Add(agentID, av); m_syncedAvatars.Add(agentID, av);
} }
m_scene.AddNewClient(av); //m_scene.AddNewClient(av);
m_scene.AddNewClient2(av, true, false);
RegionSyncMessage.HandleSuccess(LogHeader, msg, String.Format("Handled AddAgent for UUID {0} at {1}", agentID, startPos.ToString())); RegionSyncMessage.HandleSuccess(LogHeader, msg, String.Format("Handled AddAgent for UUID {0} at {1}", agentID, startPos.ToString()));
return; return;
} }

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

@ -3008,9 +3008,11 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="client"></param> /// <param name="client"></param>
public override void AddNewClient(IClientAPI client) public override void AddNewClient(IClientAPI client)
{ {
AddNewClient2(client, true); //AddNewClient2(client, true);
AddNewClient2(client, true, true);
} }
public void AddNewClient2(IClientAPI client, bool managed) //public void AddNewClient2(IClientAPI client, bool managed)
public void AddNewClient2(IClientAPI client, bool managed, bool rezAttachment)
{ {
AgentCircuitData aCircuit = m_authenticateHandler.GetAgentCircuitData(client.CircuitCode); AgentCircuitData aCircuit = m_authenticateHandler.GetAgentCircuitData(client.CircuitCode);
@ -3049,6 +3051,7 @@ namespace OpenSim.Region.Framework.Scenes
if (aCircuit == null || (aCircuit != null && aCircuit.child == false)) if (aCircuit == null || (aCircuit != null && aCircuit.child == false))
{ {
sp.IsChildAgent = false; sp.IsChildAgent = false;
if(rezAttachment)
Util.FireAndForget(delegate(object o) { sp.RezAttachments(); }); Util.FireAndForget(delegate(object o) { sp.RezAttachments(); });
} }
} }

2
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -1650,7 +1650,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
else else
{ {
m_log.DebugFormat("[SOP]: physics actor is null for {0} with parent {1}", UUID, this.ParentGroup.UUID); //m_log.DebugFormat("[SOP]: physics actor is null for {0} with parent {1}", UUID, this.ParentGroup.UUID);
} }
} }
} }