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/ApplicationPlugins | |
| 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-13170ca627d266bbd53cd32fa71a5caa47f6fb98.zip opensim-SC-13170ca627d266bbd53cd32fa71a5caa47f6fb98.tar.gz opensim-SC-13170ca627d266bbd53cd32fa71a5caa47f6fb98.tar.bz2 opensim-SC-13170ca627d266bbd53cd32fa71a5caa47f6fb98.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/ApplicationPlugins')
| -rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index a75d10d..6983479 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -50,6 +50,7 @@ using OpenSim.Region.Framework.Scenes; | |||
| 50 | using OpenSim.Services.Interfaces; | 50 | using OpenSim.Services.Interfaces; |
| 51 | using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo; | 51 | using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo; |
| 52 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 52 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; |
| 53 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
| 53 | 54 | ||
| 54 | namespace OpenSim.ApplicationPlugins.RemoteController | 55 | namespace OpenSim.ApplicationPlugins.RemoteController |
| 55 | { | 56 | { |