aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2014-08-03 01:20:34 +0100
committerUbitUmarov2014-08-03 01:20:34 +0100
commit53e95803a554b35305b4931d26b4a15dd422e2d5 (patch)
treebadc2a1eb7ab75c6a6c6f46b62d4eca916a25029
parentcomment out a debug msg. more on gods being Gods (diff)
downloadopensim-SC-53e95803a554b35305b4931d26b4a15dd422e2d5.zip
opensim-SC-53e95803a554b35305b4931d26b4a15dd422e2d5.tar.gz
opensim-SC-53e95803a554b35305b4931d26b4a15dd422e2d5.tar.bz2
opensim-SC-53e95803a554b35305b4931d26b4a15dd422e2d5.tar.xz
test not rezzing attachments on a FireAndForget
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs27
1 files changed, 13 insertions, 14 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 4faad98..e1d0fb4 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1854,24 +1854,15 @@ namespace OpenSim.Region.Framework.Scenes
1854 // send what we have to us, even if not in cache ( bad? ) 1854 // send what we have to us, even if not in cache ( bad? )
1855 ValidateAndSendAppearanceAndAgentData(); 1855 ValidateAndSendAppearanceAndAgentData();
1856 1856
1857 // Create child agents in neighbouring regions
1858 if (openChildAgents && !IsChildAgent)
1859 {
1860 IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
1861 if (m_agentTransfer != null)
1862 m_agentTransfer.EnableChildAgents(this);
1863 }
1864
1865
1866 // attachments 1857 // attachments
1867 if (isNPC || (TeleportFlags & TeleportFlags.ViaLogin) != 0) 1858 if (isNPC || (TeleportFlags & TeleportFlags.ViaLogin) != 0)
1868 { 1859 {
1869 if (Scene.AttachmentsModule != null) 1860// if (Scene.AttachmentsModule != null)
1870 Util.FireAndForget( 1861// Util.FireAndForget(
1871 o => 1862// o =>
1872 { 1863// {
1873 Scene.AttachmentsModule.RezAttachments(this); 1864 Scene.AttachmentsModule.RezAttachments(this);
1874 }); 1865// });
1875 } 1866 }
1876 else 1867 else
1877 { 1868 {
@@ -1895,6 +1886,14 @@ namespace OpenSim.Region.Framework.Scenes
1895 // "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", 1886 // "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms",
1896 // client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); 1887 // client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
1897 1888
1889 // Create child agents in neighbouring regions
1890 if (openChildAgents && !IsChildAgent)
1891 {
1892 IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
1893 if (m_agentTransfer != null)
1894 m_agentTransfer.EnableChildAgents(this);
1895 }
1896
1898 // send the rest of the world 1897 // send the rest of the world
1899 if (m_teleportFlags > 0 && !isNPC) 1898 if (m_teleportFlags > 0 && !isNPC)
1900 SendInitialDataToMe(); 1899 SendInitialDataToMe();