diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 3a40196..fa2c7b5 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -928,10 +928,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
928 | //else | 928 | //else |
929 | // m_log.ErrorFormat("[SCENE]: Could not find user info for {0} when making it a root agent", m_uuid); | 929 | // m_log.ErrorFormat("[SCENE]: Could not find user info for {0} when making it a root agent", m_uuid); |
930 | 930 | ||
931 | // On the next prim update, all objects will be sent | ||
932 | // | ||
933 | m_sceneViewer.Reset(); | ||
934 | |||
935 | m_isChildAgent = false; | 931 | m_isChildAgent = false; |
936 | 932 | ||
937 | // send the animations of the other presences to me | 933 | // send the animations of the other presences to me |
@@ -1108,7 +1104,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1108 | /// </summary> | 1104 | /// </summary> |
1109 | public void CompleteMovement(IClientAPI client) | 1105 | public void CompleteMovement(IClientAPI client) |
1110 | { | 1106 | { |
1111 | DateTime startTime = DateTime.Now; | 1107 | // DateTime startTime = DateTime.Now; |
1112 | 1108 | ||
1113 | m_log.DebugFormat( | 1109 | m_log.DebugFormat( |
1114 | "[SCENE PRESENCE]: Completing movement of {0} into region {1}", | 1110 | "[SCENE PRESENCE]: Completing movement of {0} into region {1}", |
@@ -1161,9 +1157,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1161 | friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); | 1157 | friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); |
1162 | } | 1158 | } |
1163 | 1159 | ||
1164 | m_log.DebugFormat( | 1160 | // m_log.DebugFormat( |
1165 | "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", | 1161 | // "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", |
1166 | client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); | 1162 | // client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); |
1167 | } | 1163 | } |
1168 | 1164 | ||
1169 | /// <summary> | 1165 | /// <summary> |
@@ -2952,10 +2948,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2952 | if ((cAgentData.Throttles != null) && cAgentData.Throttles.Length > 0) | 2948 | if ((cAgentData.Throttles != null) && cAgentData.Throttles.Length > 0) |
2953 | ControllingClient.SetChildAgentThrottle(cAgentData.Throttles); | 2949 | ControllingClient.SetChildAgentThrottle(cAgentData.Throttles); |
2954 | 2950 | ||
2955 | // Sends out the objects in the user's draw distance if m_sendTasksToChild is true. | ||
2956 | if (m_scene.m_seeIntoRegionFromNeighbor) | ||
2957 | m_sceneViewer.Reset(); | ||
2958 | |||
2959 | //cAgentData.AVHeight; | 2951 | //cAgentData.AVHeight; |
2960 | m_rootRegionHandle = cAgentData.RegionHandle; | 2952 | m_rootRegionHandle = cAgentData.RegionHandle; |
2961 | //m_velocity = cAgentData.Velocity; | 2953 | //m_velocity = cAgentData.Velocity; |