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

2017-01-06 01:53:50 +00:00 · 2017-01-06 01:53:50 +00:00 · 244f7e6280
parent ad531ecb53 1b64a45f66
commit 244f7e6280
1 changed files with 2 additions and 1 deletions
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@ -1290,7 +1290,7 @@ namespace OpenSim.Region.Framework.Scenes
                }

                IsChildAgent = false;
-                GodController.SyncViewerState();
+                
            }

            m_log.DebugFormat("[MakeRootAgent] out lock: {0}ms", Util.EnvironmentTickCountSubtract(ts));
@ -2122,6 +2122,7 @@ namespace OpenSim.Region.Framework.Scenes
                }

                if(!IsChildAgent && !isNPC)
+                    GodController.SyncViewerState();
                    
 // start sending terrain patchs
                if (!gotCrossUpdate && !isNPC)