diff options
Diffstat (limited to 'OpenSim/Framework/RegionSettings.cs')
-rw-r--r-- | OpenSim/Framework/RegionSettings.cs | 42 |
1 files changed, 32 insertions, 10 deletions
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs index a895c40..c2947a2 100644 --- a/OpenSim/Framework/RegionSettings.cs +++ b/OpenSim/Framework/RegionSettings.cs | |||
@@ -91,7 +91,7 @@ namespace OpenSim.Framework | |||
91 | string[] parts = str.Split(','); | 91 | string[] parts = str.Split(','); |
92 | if (parts.Length != 3) | 92 | if (parts.Length != 3) |
93 | throw new ArgumentException("Invalid string: " + str); | 93 | throw new ArgumentException("Invalid string: " + str); |
94 | 94 | ||
95 | SpawnPoint sp = new SpawnPoint(); | 95 | SpawnPoint sp = new SpawnPoint(); |
96 | sp.Yaw = float.Parse(parts[0]); | 96 | sp.Yaw = float.Parse(parts[0]); |
97 | sp.Pitch = float.Parse(parts[1]); | 97 | sp.Pitch = float.Parse(parts[1]); |
@@ -105,7 +105,7 @@ namespace OpenSim.Framework | |||
105 | public delegate void SaveDelegate(RegionSettings rs); | 105 | public delegate void SaveDelegate(RegionSettings rs); |
106 | 106 | ||
107 | public event SaveDelegate OnSave; | 107 | public event SaveDelegate OnSave; |
108 | 108 | ||
109 | /// <value> | 109 | /// <value> |
110 | /// These appear to be terrain textures that are shipped with the client. | 110 | /// These appear to be terrain textures that are shipped with the client. |
111 | /// </value> | 111 | /// </value> |
@@ -454,24 +454,24 @@ namespace OpenSim.Framework | |||
454 | get { return m_LoadedCreationDateTime; } | 454 | get { return m_LoadedCreationDateTime; } |
455 | set { m_LoadedCreationDateTime = value; } | 455 | set { m_LoadedCreationDateTime = value; } |
456 | } | 456 | } |
457 | 457 | ||
458 | public String LoadedCreationDate | 458 | public String LoadedCreationDate |
459 | { | 459 | { |
460 | get | 460 | get |
461 | { | 461 | { |
462 | TimeSpan ts = new TimeSpan(0, 0, LoadedCreationDateTime); | 462 | TimeSpan ts = new TimeSpan(0, 0, LoadedCreationDateTime); |
463 | DateTime stamp = new DateTime(1970, 1, 1) + ts; | 463 | DateTime stamp = new DateTime(1970, 1, 1) + ts; |
464 | return stamp.ToLongDateString(); | 464 | return stamp.ToLongDateString(); |
465 | } | 465 | } |
466 | } | 466 | } |
467 | 467 | ||
468 | public String LoadedCreationTime | 468 | public String LoadedCreationTime |
469 | { | 469 | { |
470 | get | 470 | get |
471 | { | 471 | { |
472 | TimeSpan ts = new TimeSpan(0, 0, LoadedCreationDateTime); | 472 | TimeSpan ts = new TimeSpan(0, 0, LoadedCreationDateTime); |
473 | DateTime stamp = new DateTime(1970, 1, 1) + ts; | 473 | DateTime stamp = new DateTime(1970, 1, 1) + ts; |
474 | return stamp.ToLongTimeString(); | 474 | return stamp.ToLongTimeString(); |
475 | } | 475 | } |
476 | } | 476 | } |
477 | 477 | ||
@@ -482,6 +482,28 @@ namespace OpenSim.Framework | |||
482 | set { m_LoadedCreationID = value; } | 482 | set { m_LoadedCreationID = value; } |
483 | } | 483 | } |
484 | 484 | ||
485 | private bool m_GodBlockSearch = false; | ||
486 | public bool GodBlockSearch | ||
487 | { | ||
488 | get { return m_GodBlockSearch; } | ||
489 | set { m_GodBlockSearch = value; } | ||
490 | } | ||
491 | |||
492 | private bool m_Casino = false; | ||
493 | public bool Casino | ||
494 | { | ||
495 | get { return m_Casino; } | ||
496 | set { m_Casino = value; } | ||
497 | } | ||
498 | |||
499 | // Telehub support | ||
500 | private bool m_TelehubEnabled = false; | ||
501 | public bool HasTelehub | ||
502 | { | ||
503 | get { return m_TelehubEnabled; } | ||
504 | set { m_TelehubEnabled = value; } | ||
505 | } | ||
506 | |||
485 | /// <summary> | 507 | /// <summary> |
486 | /// Connected Telehub object | 508 | /// Connected Telehub object |
487 | /// </summary> | 509 | /// </summary> |
@@ -520,4 +542,4 @@ namespace OpenSim.Framework | |||
520 | l_SpawnPoints.Clear(); | 542 | l_SpawnPoints.Clear(); |
521 | } | 543 | } |
522 | } | 544 | } |
523 | } \ No newline at end of file | 545 | } |