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

start sending terrain patchs in completmovement where we know its 

position. Also reset camera to position on makeroot
avinationmerge
UbitUmarov 2015-08-31 14:08:32 +01:00
parent 0900f9dd7f
commit 4905c74ddf
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3030,7 +3030,7 @@ namespace OpenSim.Region.Framework.Scenes
public virtual void SubscribeToClientTerrainEvents(IClientAPI client) public virtual void SubscribeToClientTerrainEvents(IClientAPI client)
{ {
client.OnRegionHandShakeReply += SendLayerData; // client.OnRegionHandShakeReply += SendLayerData;
} }
public virtual void SubscribeToClientPrimEvents(IClientAPI client) public virtual void SubscribeToClientPrimEvents(IClientAPI client)
@ -3158,7 +3158,7 @@ namespace OpenSim.Region.Framework.Scenes
public virtual void UnSubscribeToClientTerrainEvents(IClientAPI client) public virtual void UnSubscribeToClientTerrainEvents(IClientAPI client)
{ {
client.OnRegionHandShakeReply -= SendLayerData; // client.OnRegionHandShakeReply -= SendLayerData;
} }
public virtual void UnSubscribeToClientPrimEvents(IClientAPI client) public virtual void UnSubscribeToClientPrimEvents(IClientAPI client)

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

@ -1198,6 +1198,8 @@ no information to check this
} }
AbsolutePosition = pos; AbsolutePosition = pos;
// reset camera to avatar pos
CameraPosition = pos;
if (m_teleportFlags == TeleportFlags.Default) if (m_teleportFlags == TeleportFlags.Default)
{ {
@ -1733,6 +1735,10 @@ no information to check this
look = new Vector3(0.99f, 0.042f, 0); look = new Vector3(0.99f, 0.042f, 0);
} }
// start sending terrain patchs
if (!isNPC)
Scene.SendLayerData(ControllingClient);
if (!IsChildAgent && !isNPC) if (!IsChildAgent && !isNPC)
{ {
InventoryFolderBase cof = m_scene.InventoryService.GetFolderForType(client.AgentId, (AssetType)46); InventoryFolderBase cof = m_scene.InventoryService.GetFolderForType(client.AgentId, (AssetType)46);