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

long-lost fixes to physics -- proper physical avatar management on crossings, TP

afrisby
dan miller 2007-09-24 02:40:13 +00:00
parent 47256cebda
commit a9a126063f
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -277,7 +277,7 @@ namespace OpenSim.Region.ClientStack
clientPingTimer.Enabled = true; clientPingTimer.Enabled = true;
MainLog.Instance.Verbose("OpenSimClient.cs:InitNewClient() - Adding viewer agent to scene"); MainLog.Instance.Verbose("OpenSimClient.cs:InitNewClient() - Adding viewer agent to scene");
this.m_scene.AddNewClient(this, false); this.m_scene.AddNewClient(this, true);
} }
protected virtual void AuthUser() protected virtual void AuthUser()

4
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -1063,9 +1063,9 @@ namespace OpenSim.Region.Environment.Scenes
// agent.startpos = new LLVector3(128, 128, 70); // agent.startpos = new LLVector3(128, 128, 70);
agent.startpos = position; agent.startpos = position;
agent.child = true; agent.child = true;
m_scenePresences[remoteClient.AgentId].Close();
commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent); commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent);
commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position, false); commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position, false);
AgentCircuitData circuitdata = remoteClient.RequestClientInfo(); AgentCircuitData circuitdata = remoteClient.RequestClientInfo();
string capsPath = Util.GetCapsURL(remoteClient.AgentId); string capsPath = Util.GetCapsURL(remoteClient.AgentId);
remoteClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), capsPath); remoteClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), capsPath);
@ -1364,4 +1364,4 @@ namespace OpenSim.Region.Environment.Scenes
base.Close(); base.Close();
} }
} }
} }

1
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -413,6 +413,7 @@ namespace OpenSim.Region.Environment.Scenes
m_isChildAgent = false; m_isChildAgent = false;
//this.m_scene.SendAllSceneObjectsToClient(this.ControllingClient); //this.m_scene.SendAllSceneObjectsToClient(this.ControllingClient);
this.MakeAvatarPhysical(this.AbsolutePosition, false);
} }
} }