diff options
author | Justin Clark-Casey (justincc) | 2014-01-24 19:16:59 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-01-24 19:16:59 +0000 |
commit | 87e725cd2474efcdfec3d85794ef2b877c8b78d6 (patch) | |
tree | ffd2f4e5fffecb84e76f07d3fd87d9f29b5fcada /OpenSim/Framework/RegionSettings.cs | |
parent | Change version to 0.7.6.1-rc1 instead (diff) | |
parent | Properly dispose of drawing objects to reduce/stop memory leakage on generati... (diff) | |
download | opensim-SC_OLD-87e725cd2474efcdfec3d85794ef2b877c8b78d6.zip opensim-SC_OLD-87e725cd2474efcdfec3d85794ef2b877c8b78d6.tar.gz opensim-SC_OLD-87e725cd2474efcdfec3d85794ef2b877c8b78d6.tar.bz2 opensim-SC_OLD-87e725cd2474efcdfec3d85794ef2b877c8b78d6.tar.xz |
Merge branch '0.7.6-extended' into 0.7.6-post-fixes
Diffstat (limited to 'OpenSim/Framework/RegionSettings.cs')
-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 |