ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
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
This commit is contained in:
Melanie
2012-07-19 09:47:51 +01:00
parent 4917637ce6 6dda7c65ae
commit 36d744e2a5
18 changed files with 252 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/IScene.cs
View File

@@ -66,6 +66,11 @@ namespace OpenSim.Framework
IConfigSource Config { get; }
/// <summary>
/// Are logins enabled on this simulator?
/// </summary>
bool LoginsEnabled { get; set; }
float TimeDilation { get; }
bool AllowScriptCrossings { get; }