ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'justincc-master'

Browse Source
This commit is contained in:
Justin Clark-Casey (justincc)
2014-01-20 19:34:55 +00:00
parent 4800303abd 8e72b53edc
commit 2cf7478b9a
7 changed files with 186 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Framework/RegionSettings.cs
View File

@@ -482,21 +482,14 @@ namespace OpenSim.Framework
set { m_LoadedCreationID = value; }
}
// Connected Telehub object
private UUID m_TelehubObject = UUID.Zero;
public UUID TelehubObject
{
get
{
return m_TelehubObject;
}
set
{
m_TelehubObject = value;
}
}
/// <summary>
/// Connected Telehub object
/// </summary>
public UUID TelehubObject { get; set; }
// Our Connected Telehub's SpawnPoints
/// <summary>
/// Our connected Telehub's SpawnPoints
/// </summary>
public List<SpawnPoint> l_SpawnPoints = new List<SpawnPoint>();
// Add a SpawnPoint