aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2015-08-31 14:08:32 +0100
committerUbitUmarov2015-08-31 14:08:32 +0100
commit4905c74ddffba50bb3e576c69fdc71c64cfcc3b8 (patch)
treee2451fe2dea0884ceb1e29b1aa9e7729a89513ab /OpenSim
parent fix slow moving physical objects moving without sending updates (diff)
downloadopensim-SC_OLD-4905c74ddffba50bb3e576c69fdc71c64cfcc3b8.zip
opensim-SC_OLD-4905c74ddffba50bb3e576c69fdc71c64cfcc3b8.tar.gz
opensim-SC_OLD-4905c74ddffba50bb3e576c69fdc71c64cfcc3b8.tar.bz2
opensim-SC_OLD-4905c74ddffba50bb3e576c69fdc71c64cfcc3b8.tar.xz
start sending terrain patchs in completmovement where we know its
position. Also reset camera to position on makeroot
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
2 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 605c788..61e31e4 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3030,7 +3030,7 @@ namespace OpenSim.Region.Framework.Scenes
3030 3030
3031 public virtual void SubscribeToClientTerrainEvents(IClientAPI client) 3031 public virtual void SubscribeToClientTerrainEvents(IClientAPI client)
3032 { 3032 {
3033 client.OnRegionHandShakeReply += SendLayerData; 3033// client.OnRegionHandShakeReply += SendLayerData;
3034 } 3034 }
3035 3035
3036 public virtual void SubscribeToClientPrimEvents(IClientAPI client) 3036 public virtual void SubscribeToClientPrimEvents(IClientAPI client)
@@ -3158,7 +3158,7 @@ namespace OpenSim.Region.Framework.Scenes
3158 3158
3159 public virtual void UnSubscribeToClientTerrainEvents(IClientAPI client) 3159 public virtual void UnSubscribeToClientTerrainEvents(IClientAPI client)
3160 { 3160 {
3161 client.OnRegionHandShakeReply -= SendLayerData; 3161// client.OnRegionHandShakeReply -= SendLayerData;
3162 } 3162 }
3163 3163
3164 public virtual void UnSubscribeToClientPrimEvents(IClientAPI client) 3164 public virtual void UnSubscribeToClientPrimEvents(IClientAPI client)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 045a450..cd5525c 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1198,6 +1198,8 @@ no information to check this
1198 } 1198 }
1199 AbsolutePosition = pos; 1199 AbsolutePosition = pos;
1200 1200
1201 // reset camera to avatar pos
1202 CameraPosition = pos;
1201 1203
1202 if (m_teleportFlags == TeleportFlags.Default) 1204 if (m_teleportFlags == TeleportFlags.Default)
1203 { 1205 {
@@ -1733,6 +1735,10 @@ no information to check this
1733 look = new Vector3(0.99f, 0.042f, 0); 1735 look = new Vector3(0.99f, 0.042f, 0);
1734 } 1736 }
1735 1737
1738// start sending terrain patchs
1739 if (!isNPC)
1740 Scene.SendLayerData(ControllingClient);
1741
1736 if (!IsChildAgent && !isNPC) 1742 if (!IsChildAgent && !isNPC)
1737 { 1743 {
1738 InventoryFolderBase cof = m_scene.InventoryService.GetFolderForType(client.AgentId, (AssetType)46); 1744 InventoryFolderBase cof = m_scene.InventoryService.GetFolderForType(client.AgentId, (AssetType)46);