From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 19 May 2019 21:24:15 +1000 Subject: Dump OpenSim 0.9.0.1 into it's own branch. --- .../Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs') diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs index 7ae4223..54f3ab6 100644 --- a/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs +++ b/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs @@ -108,8 +108,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport { if (m_Enabled) { - IEntityTransferModule et = m_scene.RequestModuleInterface(); - m_Helper = new SimulatorFeaturesHelper(scene, et); + m_Helper = new SimulatorFeaturesHelper(scene); ISimulatorFeaturesModule featuresModule = m_scene.RequestModuleInterface(); if (featuresModule != null) @@ -124,7 +123,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features) { m_log.DebugFormat("[CAMERA-ONLY MODE]: OnSimulatorFeaturesRequest in {0}", m_scene.RegionInfo.RegionName); - if (m_Helper.ShouldSend(agentID) && m_Helper.UserLevel(agentID) <= m_UserLevel) + if (m_Helper.UserLevel(agentID) <= m_UserLevel) { OSDMap extrasMap; if (features.ContainsKey("OpenSimExtras")) @@ -162,7 +161,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport { foreach (SceneObjectGroup sog in attachs) { - m_log.DebugFormat("[CAMERA-ONLY MODE]: Forcibly detaching attach {0} from {1} in {2}", + m_log.DebugFormat("[CAMERA-ONLY MODE]: Forcibly detaching attach {0} from {1} in {2}", sog.Name, sp.Name, m_scene.RegionInfo.RegionName); m_scene.AttachmentsModule.DetachSingleAttachmentToInv(sp, sog); -- cgit v1.1