Merge branch 'master' into careminster

Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
author: Melanie 2013-05-30 21:48:09 +0100
committer: Melanie 2013-05-30 21:48:09 +0100
commit: 669fa3ff9ab911dc7ee686b47e49a65f67a0a809 (patch)
tree: 6ea7f58cc6365595281f823f3994d2d22299ee40 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parent: Merge branch 'master' into careminster (diff)
parent: Try caching the user name for a new agent earlier on in the process of establ... (diff)
download: opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.zip
opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.gz
opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.bz2
opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.xz
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 5184585..83bd3fb 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1550,6 +1550,7 @@ namespace OpenSim.Region.Framework.Scenes
            // Create child agents in neighbouring regions
            if (openChildAgents && !IsChildAgent)
            {
+                // Remember in HandleUseCircuitCode, we delayed this to here
                SendInitialDataToMe();
                IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
author	Melanie	2013-05-30 21:48:09 +0100
committer	Melanie	2013-05-30 21:48:09 +0100
commit	669fa3ff9ab911dc7ee686b47e49a65f67a0a809 (patch)
tree	6ea7f58cc6365595281f823f3994d2d22299ee40 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parent	Merge branch 'master' into careminster (diff)
parent	Try caching the user name for a new agent earlier on in the process of establ... (diff)
download	opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.zip opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.gz opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.bz2 opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.xz

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 5184585..83bd3fb 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1550,6 +1550,7 @@ namespace OpenSim.Region.Framework.Scenes
1550	// Create child agents in neighbouring regions	1550	// Create child agents in neighbouring regions
1551	if (openChildAgents && !IsChildAgent)	1551	if (openChildAgents && !IsChildAgent)
1552	{	1552	{
		1553	// Remember in HandleUseCircuitCode, we delayed this to here
1553	SendInitialDataToMe();	1554	SendInitialDataToMe();
1554		1555
1555	IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();	1556	IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();