diff options
Merge branch 'master' into presence-refactor
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index a67b42a..f1813a5 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
| @@ -60,12 +60,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 60 | 60 | ||
| 61 | protected RegionCommsListener regionCommsHost; | 61 | protected RegionCommsListener regionCommsHost; |
| 62 | 62 | ||
| 63 | public bool RegionLoginsEnabled | 63 | protected List<UUID> m_agentsInTransit; |
| 64 | { | ||
| 65 | get { return m_regionLoginsEnabled; } | ||
| 66 | set { m_regionLoginsEnabled = value; } | ||
| 67 | } | ||
| 68 | private bool m_regionLoginsEnabled = false; | ||
| 69 | 64 | ||
| 70 | /// <summary> | 65 | /// <summary> |
| 71 | /// An agent is crossing into this region | 66 | /// An agent is crossing into this region |