OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster

avinationmerge
Melanie 2009-12-25 23:17:08 +00:00
parent 0054afd39b d5618fbcc3
commit 59a841d69c
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
View File

@ -43,6 +43,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private Scene m_scene; private Scene m_scene;
private IProfileModule m_profileModule = null; private IProfileModule m_profileModule = null;
private bool m_enabled = true;
public AvatarProfilesModule() public AvatarProfilesModule()
{ {
@ -52,12 +53,24 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles
public void Initialise(Scene scene, IConfigSource config) 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 = scene;
m_scene.EventManager.OnNewClient += NewClient; m_scene.EventManager.OnNewClient += NewClient;
} }
public void PostInitialise() public void PostInitialise()
{ {
if (!m_enabled)
return;
m_profileModule = m_scene.RequestModuleInterface<IProfileModule>(); m_profileModule = m_scene.RequestModuleInterface<IProfileModule>();
} }

4
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -6606,6 +6606,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// retain pathcurve // retain pathcurve
shapeBlock.PathCurve = part.Shape.PathCurve; shapeBlock.PathCurve = part.Shape.PathCurve;
part.Shape.SculptEntry = false;
return shapeBlock; return shapeBlock;
} }
@ -6657,6 +6658,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
shapeBlock.PathShearX = (byte)(100 * topshear.x); shapeBlock.PathShearX = (byte)(100 * topshear.x);
shapeBlock.PathShearY = (byte)(100 * topshear.y); shapeBlock.PathShearY = (byte)(100 * topshear.y);
part.Shape.SculptEntry = false;
part.UpdateShape(shapeBlock); part.UpdateShape(shapeBlock);
} }
@ -6701,6 +6703,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
shapeBlock.ProfileBegin = (ushort)(50000 * dimple.x); shapeBlock.ProfileBegin = (ushort)(50000 * dimple.x);
shapeBlock.ProfileEnd = (ushort)(50000 * (1 - dimple.y)); shapeBlock.ProfileEnd = (ushort)(50000 * (1 - dimple.y));
part.Shape.SculptEntry = false;
part.UpdateShape(shapeBlock); part.UpdateShape(shapeBlock);
} }
@ -6824,6 +6827,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
shapeBlock.PathSkew = (sbyte)(100 * skew); shapeBlock.PathSkew = (sbyte)(100 * skew);
part.Shape.SculptEntry = false;
part.UpdateShape(shapeBlock); part.UpdateShape(shapeBlock);
} }