merge crap gerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

Conflicts:
	bin/Regions/Regions.ini.example
	bin/lib32/BulletSim.dll
	bin/lib32/libBulletSim.so
	bin/lib64/BulletSim.dll
	bin/lib64/libBulletSim.so

1 files changed, 13 insertions, 0 deletions

diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index a9432c2..87ec99e 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -66,6 +66,19 @@ namespace OpenSim.Framework
 
         IConfigSource Config { get; }
 
+        /// <summary>
+        /// Are logins enabled on this simulator?
+        /// </summary>
+        bool LoginsEnabled { get; set; }
+
+        /// <summary>
+        /// Is this region ready for use?
+        /// </summary>
+        /// <remarks>
+        /// This does not mean that logins are enabled, merely that they can be.
+        /// </remarks>
+        bool Ready { get; set; }
+
         float TimeDilation { get; }
 
         bool AllowScriptCrossings { get; }