diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs index 4ffb03b..9c0fa75 100644 --- a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs +++ b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs | |||
@@ -52,14 +52,14 @@ namespace OpenSim.Region.OptionalModules | |||
52 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 52 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
53 | private bool m_enabled; | 53 | private bool m_enabled; |
54 | 54 | ||
55 | public string Name { get { return "PrimLimitsModule"; } } | 55 | public string Name { get { return "PrimLimitsModule"; } } |
56 | 56 | ||
57 | public Type ReplaceableInterface { get { return null; } } | 57 | public Type ReplaceableInterface { get { return null; } } |
58 | 58 | ||
59 | public void Initialise(IConfigSource config) | 59 | public void Initialise(IConfigSource config) |
60 | { | 60 | { |
61 | string permissionModules = Util.GetConfigVarFromSections<string>(config, "permissionmodules", | 61 | string permissionModules = Util.GetConfigVarFromSections<string>(config, "permissionmodules", |
62 | new string[] { "Startup", "Permissions" }, "DefaultPermissionsModule"); | 62 | new string[] { "Startup", "Permissions" }, "DefaultPermissionsModule"); |
63 | 63 | ||
64 | List<string> modules = new List<string>(permissionModules.Split(',').Select(m => m.Trim())); | 64 | List<string> modules = new List<string>(permissionModules.Split(',').Select(m => m.Trim())); |
65 | 65 | ||
@@ -69,11 +69,11 @@ namespace OpenSim.Region.OptionalModules | |||
69 | m_log.DebugFormat("[PRIM LIMITS]: Initialized module"); | 69 | m_log.DebugFormat("[PRIM LIMITS]: Initialized module"); |
70 | m_enabled = true; | 70 | m_enabled = true; |
71 | } | 71 | } |
72 | 72 | ||
73 | public void Close() | 73 | public void Close() |
74 | { | 74 | { |
75 | } | 75 | } |
76 | 76 | ||
77 | public void AddRegion(Scene scene) | 77 | public void AddRegion(Scene scene) |
78 | { | 78 | { |
79 | if (!m_enabled) | 79 | if (!m_enabled) |
@@ -86,7 +86,7 @@ namespace OpenSim.Region.OptionalModules | |||
86 | 86 | ||
87 | m_log.DebugFormat("[PRIM LIMITS]: Region {0} added", scene.RegionInfo.RegionName); | 87 | m_log.DebugFormat("[PRIM LIMITS]: Region {0} added", scene.RegionInfo.RegionName); |
88 | } | 88 | } |
89 | 89 | ||
90 | public void RemoveRegion(Scene scene) | 90 | public void RemoveRegion(Scene scene) |
91 | { | 91 | { |
92 | if (m_enabled) | 92 | if (m_enabled) |
@@ -97,8 +97,8 @@ namespace OpenSim.Region.OptionalModules | |||
97 | scene.Permissions.OnRezObject -= CanRezObject; | 97 | scene.Permissions.OnRezObject -= CanRezObject; |
98 | scene.Permissions.OnObjectEntry -= CanObjectEnter; | 98 | scene.Permissions.OnObjectEntry -= CanObjectEnter; |
99 | scene.Permissions.OnDuplicateObject -= CanDuplicateObject; | 99 | scene.Permissions.OnDuplicateObject -= CanDuplicateObject; |
100 | } | 100 | } |
101 | 101 | ||
102 | public void RegionLoaded(Scene scene) | 102 | public void RegionLoaded(Scene scene) |
103 | { | 103 | { |
104 | m_dialogModule = scene.RequestModuleInterface<IDialogModule>(); | 104 | m_dialogModule = scene.RequestModuleInterface<IDialogModule>(); |
@@ -158,7 +158,7 @@ namespace OpenSim.Region.OptionalModules | |||
158 | 158 | ||
159 | Vector3 oldPoint = obj.GroupPosition; | 159 | Vector3 oldPoint = obj.GroupPosition; |
160 | ILandObject oldParcel = scene.LandChannel.GetLandObject(oldPoint.X, oldPoint.Y); | 160 | ILandObject oldParcel = scene.LandChannel.GetLandObject(oldPoint.X, oldPoint.Y); |
161 | 161 | ||
162 | // The prim hasn't crossed a region boundry so we don't need to worry | 162 | // The prim hasn't crossed a region boundry so we don't need to worry |
163 | // about prim counts here | 163 | // about prim counts here |
164 | if(oldParcel != null && oldParcel.Equals(newParcel)) | 164 | if(oldParcel != null && oldParcel.Equals(newParcel)) |