diff --git a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs index 0f5878873b..8cf58c6df0 100644 --- a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs @@ -43,6 +43,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private Scene m_scene; private IProfileModule m_profileModule = null; + private bool m_enabled = true; public AvatarProfilesModule() { @@ -52,12 +53,24 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles public void Initialise(Scene scene, IConfigSource config) { + IConfig profileConfig = config.Configs["Profile"]; + if (profileConfig != null) + { + if (profileConfig.GetString("Module", Name) != Name) + { + m_enabled = false; + return; + } + } + m_scene = scene; m_scene.EventManager.OnNewClient += NewClient; } public void PostInitialise() { + if (!m_enabled) + return; m_profileModule = m_scene.RequestModuleInterface(); } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index cc903e0591..c9d6742822 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -6606,6 +6606,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // retain pathcurve shapeBlock.PathCurve = part.Shape.PathCurve; + part.Shape.SculptEntry = false; return shapeBlock; } @@ -6657,6 +6658,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api shapeBlock.PathShearX = (byte)(100 * topshear.x); shapeBlock.PathShearY = (byte)(100 * topshear.y); + part.Shape.SculptEntry = false; part.UpdateShape(shapeBlock); } @@ -6701,6 +6703,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api shapeBlock.ProfileBegin = (ushort)(50000 * dimple.x); shapeBlock.ProfileEnd = (ushort)(50000 * (1 - dimple.y)); + part.Shape.SculptEntry = false; part.UpdateShape(shapeBlock); } @@ -6824,6 +6827,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } shapeBlock.PathSkew = (sbyte)(100 * skew); + part.Shape.SculptEntry = false; part.UpdateShape(shapeBlock); }