diff options
author | Justin Clark-Casey (justincc) | 2014-01-20 19:16:19 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-01-20 19:37:50 +0000 |
commit | 27abe040bddc11feb78757467c5e330f4cda840b (patch) | |
tree | cc22d0733110efa84b0cc070ed448e9e70a56215 /OpenSim/Framework | |
parent | Actually put IsChildAgent = true inside the lock, otherwise there is still a ... (diff) | |
download | opensim-SC_OLD-27abe040bddc11feb78757467c5e330f4cda840b.zip opensim-SC_OLD-27abe040bddc11feb78757467c5e330f4cda840b.tar.gz opensim-SC_OLD-27abe040bddc11feb78757467c5e330f4cda840b.tar.bz2 opensim-SC_OLD-27abe040bddc11feb78757467c5e330f4cda840b.tar.xz |
Stop exceptions being generated on agent connection if a telehub object has been deleted or has no spawn points.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/RegionSettings.cs | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs index db8c53e..a895c40 100644 --- a/OpenSim/Framework/RegionSettings.cs +++ b/OpenSim/Framework/RegionSettings.cs | |||
@@ -482,21 +482,14 @@ namespace OpenSim.Framework | |||
482 | set { m_LoadedCreationID = value; } | 482 | set { m_LoadedCreationID = value; } |
483 | } | 483 | } |
484 | 484 | ||
485 | // Connected Telehub object | 485 | /// <summary> |
486 | private UUID m_TelehubObject = UUID.Zero; | 486 | /// Connected Telehub object |
487 | public UUID TelehubObject | 487 | /// </summary> |
488 | { | 488 | public UUID TelehubObject { get; set; } |
489 | get | ||
490 | { | ||
491 | return m_TelehubObject; | ||
492 | } | ||
493 | set | ||
494 | { | ||
495 | m_TelehubObject = value; | ||
496 | } | ||
497 | } | ||
498 | 489 | ||
499 | // Our Connected Telehub's SpawnPoints | 490 | /// <summary> |
491 | /// Our connected Telehub's SpawnPoints | ||
492 | /// </summary> | ||
500 | public List<SpawnPoint> l_SpawnPoints = new List<SpawnPoint>(); | 493 | public List<SpawnPoint> l_SpawnPoints = new List<SpawnPoint>(); |
501 | 494 | ||
502 | // Add a SpawnPoint | 495 | // Add a SpawnPoint |