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

Merge branch 'master' into ubitworkmaster

avinationmerge
UbitUmarov 2014-09-23 23:20:28 +01:00
parent 992bd703e7 a6b27a7aa4
commit f37364b56f
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/ColliderData.cs
View File

@ -42,6 +42,7 @@ namespace OpenSim.Framework
public Vector3 velVector = Vector3.Zero; public Vector3 velVector = Vector3.Zero;
public string nameStr = String.Empty; public string nameStr = String.Empty;
public int colliderType = 0; public int colliderType = 0;
public int linkNumber;
} }
public class ColliderArgs : EventArgs public class ColliderArgs : EventArgs

8
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
View File

@ -139,6 +139,14 @@ namespace OpenSim.Region.CoreModules.Framework
{ {
Caps oldCaps = m_capsObjects[circuitCode]; Caps oldCaps = m_capsObjects[circuitCode];
// Remove tge handlers. They may conflict with the
// new object created below
oldCaps.DeregisterHandlers();
// Better safe ... should not be needed but also
// no big deal
m_capsObjects.Remove(circuitCode);
// if (capsObjectPath == oldCaps.CapsObjectPath) // if (capsObjectPath == oldCaps.CapsObjectPath)
// { // {
// m_log.WarnFormat( // m_log.WarnFormat(

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

@ -3988,6 +3988,12 @@ namespace OpenSim.Region.Framework.Scenes
// We need the circuit data here for some of the subsequent checks. (groups, for example) // We need the circuit data here for some of the subsequent checks. (groups, for example)
// If the checks fail, we remove the circuit. // If the checks fail, we remove the circuit.
acd.teleportFlags = teleportFlags; acd.teleportFlags = teleportFlags;
// Remove any preexisting circuit - we don't want duplicates
// This is a stab at preventing avatar "ghosting"
if (vialogin)
m_authenticateHandler.RemoveCircuit(acd.AgentID);
m_authenticateHandler.AddNewCircuit(acd.circuitcode, acd); m_authenticateHandler.AddNewCircuit(acd.circuitcode, acd);
land = LandChannel.GetLandObject(acd.startpos.X, acd.startpos.Y); land = LandChannel.GetLandObject(acd.startpos.X, acd.startpos.Y);