From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001
From: onefang
Date: Sun, 19 May 2019 21:24:15 +1000
Subject: Dump OpenSim 0.9.0.1 into it's own branch.
---
OpenSim/Framework/RegionSettings.cs | 42 ++++++++++++++++++++++++++++---------
1 file changed, 32 insertions(+), 10 deletions(-)
(limited to 'OpenSim/Framework/RegionSettings.cs')
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
string[] parts = str.Split(',');
if (parts.Length != 3)
throw new ArgumentException("Invalid string: " + str);
-
+
SpawnPoint sp = new SpawnPoint();
sp.Yaw = float.Parse(parts[0]);
sp.Pitch = float.Parse(parts[1]);
@@ -105,7 +105,7 @@ namespace OpenSim.Framework
public delegate void SaveDelegate(RegionSettings rs);
public event SaveDelegate OnSave;
-
+
///
/// These appear to be terrain textures that are shipped with the client.
///
@@ -454,24 +454,24 @@ namespace OpenSim.Framework
get { return m_LoadedCreationDateTime; }
set { m_LoadedCreationDateTime = value; }
}
-
+
public String LoadedCreationDate
{
- get
- {
+ get
+ {
TimeSpan ts = new TimeSpan(0, 0, LoadedCreationDateTime);
DateTime stamp = new DateTime(1970, 1, 1) + ts;
- return stamp.ToLongDateString();
+ return stamp.ToLongDateString();
}
}
public String LoadedCreationTime
{
- get
- {
+ get
+ {
TimeSpan ts = new TimeSpan(0, 0, LoadedCreationDateTime);
DateTime stamp = new DateTime(1970, 1, 1) + ts;
- return stamp.ToLongTimeString();
+ return stamp.ToLongTimeString();
}
}
@@ -482,6 +482,28 @@ namespace OpenSim.Framework
set { m_LoadedCreationID = value; }
}
+ private bool m_GodBlockSearch = false;
+ public bool GodBlockSearch
+ {
+ get { return m_GodBlockSearch; }
+ set { m_GodBlockSearch = value; }
+ }
+
+ private bool m_Casino = false;
+ public bool Casino
+ {
+ get { return m_Casino; }
+ set { m_Casino = value; }
+ }
+
+ // Telehub support
+ private bool m_TelehubEnabled = false;
+ public bool HasTelehub
+ {
+ get { return m_TelehubEnabled; }
+ set { m_TelehubEnabled = value; }
+ }
+
///
/// Connected Telehub object
///
@@ -520,4 +542,4 @@ namespace OpenSim.Framework
l_SpawnPoints.Clear();
}
}
-}
\ No newline at end of file
+}
--
cgit v1.1