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/Tests | |
| 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/Tests')
| -rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index 769de83..7598cc3 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
| @@ -190,7 +190,7 @@ namespace OpenSim.Tests.Common | |||
| 190 | = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", new IniConfigSource(), "test"); | 190 | = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", new IniConfigSource(), "test"); |
| 191 | 191 | ||
| 192 | testScene.RegionInfo.EstateSettings = new EstateSettings(); | 192 | testScene.RegionInfo.EstateSettings = new EstateSettings(); |
| 193 | testScene.LoginsDisabled = false; | 193 | testScene.LoginsEnabled = true; |
| 194 | testScene.RegisterRegionWithGrid(); | 194 | testScene.RegisterRegionWithGrid(); |
| 195 | 195 | ||
| 196 | SceneManager.Add(testScene); | 196 | SceneManager.Add(testScene); |