diff options
| author | Justin Clark-Casey (justincc) | 2013-03-26 20:32:22 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-03-26 20:32:22 +0000 |
| commit | 13170ca627d266bbd53cd32fa71a5caa47f6fb98 (patch) | |
| tree | 1398da06f070a14d6741b1418e3ce0bbcb705381 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Make llGetLinkPrimitiveParams() and llGetPrimitiveParams() work for avatars i... (diff) | |
| parent | Implement a pref to turn on the simulator ExportSupported feature entry. (diff) | |
| download | opensim-SC_OLD-13170ca627d266bbd53cd32fa71a5caa47f6fb98.zip opensim-SC_OLD-13170ca627d266bbd53cd32fa71a5caa47f6fb98.tar.gz opensim-SC_OLD-13170ca627d266bbd53cd32fa71a5caa47f6fb98.tar.bz2 opensim-SC_OLD-13170ca627d266bbd53cd32fa71a5caa47f6fb98.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 e8f00a4..45cbdd5 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 | { |