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

Merge branch 'master' of opensimulator.org:/var/git/opensim

melanie
Melanie Thielker 2017-01-06 01:53:50 +00:00
parent ad531ecb53 1b64a45f66
commit 244f7e6280
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1290,7 +1290,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
IsChildAgent = false; IsChildAgent = false;
GodController.SyncViewerState();
} }
m_log.DebugFormat("[MakeRootAgent] out lock: {0}ms", Util.EnvironmentTickCountSubtract(ts)); m_log.DebugFormat("[MakeRootAgent] out lock: {0}ms", Util.EnvironmentTickCountSubtract(ts));
@ -2122,6 +2122,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
if(!IsChildAgent && !isNPC) if(!IsChildAgent && !isNPC)
GodController.SyncViewerState();
// start sending terrain patchs // start sending terrain patchs
if (!gotCrossUpdate && !isNPC) if (!gotCrossUpdate && !isNPC)