diff options
| author | Melanie | 2013-03-26 03:26:28 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-26 03:26:28 +0000 |
| commit | 36c57bac8e86b5c64c5ef89a0dc24e55662ad34c (patch) | |
| tree | db7079f27f7209f5eacdd27e9a25903d56030032 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask (diff) | |
| download | opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.zip opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.tar.gz opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.tar.bz2 opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.tar.xz | |
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c324d4b..fd20c60 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -51,6 +51,7 @@ using OpenSim.Region.Physics.Manager; | |||
| 51 | using Timer=System.Timers.Timer; | 51 | using Timer=System.Timers.Timer; |
| 52 | using TPFlags = OpenSim.Framework.Constants.TeleportFlags; | 52 | using TPFlags = OpenSim.Framework.Constants.TeleportFlags; |
| 53 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 53 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; |
| 54 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
| 54 | 55 | ||
| 55 | namespace OpenSim.Region.Framework.Scenes | 56 | namespace OpenSim.Region.Framework.Scenes |
| 56 | { | 57 | { |