diff options
| author | Melanie | 2012-07-19 09:47:51 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-19 09:47:51 +0100 |
| commit | 36d744e2a5963d8f3ed33990943aa0ab25832a8b (patch) | |
| tree | ae78b4d8a5db18ad551fbe2157e9abdb7a57ce04 /OpenSim/Framework | |
| parent | Fix llSameGroup to work according to specs (diff) | |
| parent | Add EventManager.OnRegionLoginsStatusChange fired whenever logins are enabled... (diff) | |
| download | opensim-SC-36d744e2a5963d8f3ed33990943aa0ab25832a8b.zip opensim-SC-36d744e2a5963d8f3ed33990943aa0ab25832a8b.tar.gz opensim-SC-36d744e2a5963d8f3ed33990943aa0ab25832a8b.tar.bz2 opensim-SC-36d744e2a5963d8f3ed33990943aa0ab25832a8b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/IScene.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs index a9432c2..2c38e0f 100644 --- a/OpenSim/Framework/IScene.cs +++ b/OpenSim/Framework/IScene.cs | |||
| @@ -66,6 +66,11 @@ namespace OpenSim.Framework | |||
| 66 | 66 | ||
| 67 | IConfigSource Config { get; } | 67 | IConfigSource Config { get; } |
| 68 | 68 | ||
| 69 | /// <summary> | ||
| 70 | /// Are logins enabled on this simulator? | ||
| 71 | /// </summary> | ||
| 72 | bool LoginsEnabled { get; set; } | ||
| 73 | |||
| 69 | float TimeDilation { get; } | 74 | float TimeDilation { get; } |
| 70 | 75 | ||
| 71 | bool AllowScriptCrossings { get; } | 76 | bool AllowScriptCrossings { get; } |