diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 00e699e..33418e6 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3115,14 +3115,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
3115 | || (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0; | 3115 | || (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0; |
3116 | 3116 | ||
3117 | CheckHeartbeat(); | 3117 | CheckHeartbeat(); |
3118 | |||
3119 | 3118 | ||
3120 | sp = GetScenePresence(client.AgentId); | 3119 | sp = GetScenePresence(client.AgentId); |
3121 | 3120 | ||
3122 | // XXX: Not sure how good it is to add a new client if a scene presence already exists. Possibly this | ||
3123 | // could occur if a viewer crashes and relogs before the old client is kicked out. But this could cause | ||
3124 | // other problems, and possibly the code calling AddNewAgent() should ensure that no client is already | ||
3125 | // connected. | ||
3126 | if (sp == null) | 3121 | if (sp == null) |
3127 | { | 3122 | { |
3128 | m_log.DebugFormat( | 3123 | m_log.DebugFormat( |
@@ -3137,15 +3132,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
3137 | 3132 | ||
3138 | sp.TeleportFlags = (TPFlags)aCircuit.teleportFlags; | 3133 | sp.TeleportFlags = (TPFlags)aCircuit.teleportFlags; |
3139 | 3134 | ||
3140 | /* done in completMovement | ||
3141 | InventoryFolderBase cof = InventoryService.GetFolderForType(client.AgentId, (AssetType)46); | ||
3142 | if (cof == null) | ||
3143 | sp.COF = UUID.Zero; | ||
3144 | else | ||
3145 | sp.COF = cof.ID; | ||
3146 | |||
3147 | m_log.DebugFormat("[SCENE]: COF for {0} is {1}", client.AgentId, sp.COF); | ||
3148 | */ | ||
3149 | m_eventManager.TriggerOnNewPresence(sp); | 3135 | m_eventManager.TriggerOnNewPresence(sp); |
3150 | } | 3136 | } |
3151 | else | 3137 | else |