diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index bdf3d1d..ad41e88 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2593,8 +2593,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
2593 | { | 2593 | { |
2594 | string homeURL = string.Empty; | 2594 | string homeURL = string.Empty; |
2595 | string first = aCircuit.firstname, last = aCircuit.lastname; | 2595 | string first = aCircuit.firstname, last = aCircuit.lastname; |
2596 | |||
2596 | if (aCircuit.ServiceURLs.ContainsKey("HomeURI")) | 2597 | if (aCircuit.ServiceURLs.ContainsKey("HomeURI")) |
2597 | homeURL = aCircuit.ServiceURLs["HomeURI"].ToString(); | 2598 | homeURL = aCircuit.ServiceURLs["HomeURI"].ToString(); |
2599 | |||
2598 | if (aCircuit.lastname.StartsWith("@")) | 2600 | if (aCircuit.lastname.StartsWith("@")) |
2599 | { | 2601 | { |
2600 | string[] parts = aCircuit.firstname.Split('.'); | 2602 | string[] parts = aCircuit.firstname.Split('.'); |
@@ -2604,6 +2606,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2604 | last = parts[1]; | 2606 | last = parts[1]; |
2605 | } | 2607 | } |
2606 | } | 2608 | } |
2609 | |||
2607 | uMan.AddUser(aCircuit.AgentID, first, last, homeURL); | 2610 | uMan.AddUser(aCircuit.AgentID, first, last, homeURL); |
2608 | } | 2611 | } |
2609 | } | 2612 | } |
@@ -3389,7 +3392,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
3389 | } | 3392 | } |
3390 | } | 3393 | } |
3391 | 3394 | ||
3392 | |||
3393 | // In all cases, add or update the circuit data with the new agent circuit data and teleport flags | 3395 | // In all cases, add or update the circuit data with the new agent circuit data and teleport flags |
3394 | agent.teleportFlags = teleportFlags; | 3396 | agent.teleportFlags = teleportFlags; |
3395 | m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent); | 3397 | m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent); |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 80aafd0..83b761c 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1944,10 +1944,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1944 | m_log.Warn("Sit requested on unknown object: " + targetID.ToString()); | 1944 | m_log.Warn("Sit requested on unknown object: " + targetID.ToString()); |
1945 | } | 1945 | } |
1946 | 1946 | ||
1947 | |||
1948 | |||
1949 | SendSitResponse(remoteClient, targetID, offset, Quaternion.Identity); | 1947 | SendSitResponse(remoteClient, targetID, offset, Quaternion.Identity); |
1950 | } | 1948 | } |
1949 | |||
1951 | /* | 1950 | /* |
1952 | public void SitRayCastAvatarPosition(SceneObjectPart part) | 1951 | public void SitRayCastAvatarPosition(SceneObjectPart part) |
1953 | { | 1952 | { |
@@ -2380,7 +2379,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2380 | /// <param name="remoteClient"></param> | 2379 | /// <param name="remoteClient"></param> |
2381 | public void SendTerseUpdateToClient(IClientAPI remoteClient) | 2380 | public void SendTerseUpdateToClient(IClientAPI remoteClient) |
2382 | { | 2381 | { |
2383 | |||
2384 | // If the client is inactive, it's getting its updates from another | 2382 | // If the client is inactive, it's getting its updates from another |
2385 | // server. | 2383 | // server. |
2386 | if (remoteClient.IsActive) | 2384 | if (remoteClient.IsActive) |
@@ -2495,7 +2493,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2495 | } | 2493 | } |
2496 | 2494 | ||
2497 | // If we aren't using a cached appearance, then clear out the baked textures | 2495 | // If we aren't using a cached appearance, then clear out the baked textures |
2498 | if (! cachedappearance) | 2496 | if (!cachedappearance) |
2499 | { | 2497 | { |
2500 | m_appearance.ResetAppearance(); | 2498 | m_appearance.ResetAppearance(); |
2501 | if (m_scene.AvatarFactory != null) | 2499 | if (m_scene.AvatarFactory != null) |