diff options
Merge branch 'master' into careminster-presence-refactor
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Permissions.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs index 4e80bf2..06890a0 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs | |||
| @@ -997,6 +997,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 997 | } | 997 | } |
| 998 | } | 998 | } |
| 999 | return true; | 999 | return true; |
| 1000 | } | 1000 | } |
| 1001 | } | 1001 | } |
| 1002 | } \ No newline at end of file | 1002 | } \ No newline at end of file |