diff options
author | Melanie | 2012-07-28 00:39:36 +0100 |
---|---|---|
committer | Melanie | 2012-07-28 00:39:36 +0100 |
commit | 771d79e83e9ef5686aee5fe1c572673cff291083 (patch) | |
tree | b37749fc1929ffd6dd1b9c2c4e29120accf26b99 /OpenSim/Framework/IScene.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | LSL/OSSL lacks Math.Min & Math.Max implementations. (diff) | |
download | opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.zip opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.tar.gz opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.tar.bz2 opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/Application/OpenSim.cs
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
bin/OpenMetaverse.Rendering.Meshmerizer.dll
bin/OpenMetaverse.StructuredData.dll
bin/OpenMetaverse.dll
bin/OpenMetaverseTypes.dll
prebuild.xml
Diffstat (limited to 'OpenSim/Framework/IScene.cs')
-rw-r--r-- | OpenSim/Framework/IScene.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs index 2c38e0f..87ec99e 100644 --- a/OpenSim/Framework/IScene.cs +++ b/OpenSim/Framework/IScene.cs | |||
@@ -71,6 +71,14 @@ namespace OpenSim.Framework | |||
71 | /// </summary> | 71 | /// </summary> |
72 | bool LoginsEnabled { get; set; } | 72 | bool LoginsEnabled { get; set; } |
73 | 73 | ||
74 | /// <summary> | ||
75 | /// Is this region ready for use? | ||
76 | /// </summary> | ||
77 | /// <remarks> | ||
78 | /// This does not mean that logins are enabled, merely that they can be. | ||
79 | /// </remarks> | ||
80 | bool Ready { get; set; } | ||
81 | |||
74 | float TimeDilation { get; } | 82 | float TimeDilation { get; } |
75 | 83 | ||
76 | bool AllowScriptCrossings { get; } | 84 | bool AllowScriptCrossings { get; } |