diff options
| author | Melanie Thielker | 2017-01-06 01:53:50 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2017-01-06 01:53:50 +0000 |
| commit | 244f7e62808c45982562c766235013810b5d35c1 (patch) | |
| tree | 5f048c79cb799bc72bd22a1164ba5207ea7e67ad /OpenSim/Region | |
| parent | Handle the case where grid gods and local gods should coexit (diff) | |
| parent | take sync viewer out on make root (diff) | |
| download | opensim-SC-244f7e62808c45982562c766235013810b5d35c1.zip opensim-SC-244f7e62808c45982562c766235013810b5d35c1.tar.gz opensim-SC-244f7e62808c45982562c766235013810b5d35c1.tar.bz2 opensim-SC-244f7e62808c45982562c766235013810b5d35c1.tar.xz | |
Merge branch 'master' of opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 28b2f52..36d0e40 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1290,7 +1290,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1290 | } | 1290 | } |
| 1291 | 1291 | ||
| 1292 | IsChildAgent = false; | 1292 | IsChildAgent = false; |
| 1293 | GodController.SyncViewerState(); | 1293 | |
| 1294 | } | 1294 | } |
| 1295 | 1295 | ||
| 1296 | m_log.DebugFormat("[MakeRootAgent] out lock: {0}ms", Util.EnvironmentTickCountSubtract(ts)); | 1296 | m_log.DebugFormat("[MakeRootAgent] out lock: {0}ms", Util.EnvironmentTickCountSubtract(ts)); |
| @@ -2122,6 +2122,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2122 | } | 2122 | } |
| 2123 | 2123 | ||
| 2124 | if(!IsChildAgent && !isNPC) | 2124 | if(!IsChildAgent && !isNPC) |
| 2125 | GodController.SyncViewerState(); | ||
| 2125 | 2126 | ||
| 2126 | // start sending terrain patchs | 2127 | // start sending terrain patchs |
| 2127 | if (!gotCrossUpdate && !isNPC) | 2128 | if (!gotCrossUpdate && !isNPC) |