Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
commit
3d7b469c60
|
@ -80,7 +80,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
|
|||
/// <summary>
|
||||
/// Maximum number of external urls that can be set up by this module.
|
||||
/// </summary>
|
||||
private int m_TotalUrls = 5000;
|
||||
private int m_TotalUrls = 15000;
|
||||
|
||||
private uint https_port = 0;
|
||||
private IHttpServer m_HttpServer = null;
|
||||
|
|
|
@ -100,7 +100,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
{
|
||||
m_log.WarnFormat(
|
||||
"[SCENE COMMUNICATION SERVICE]: Region {0} failed to inform neighbour at {1}-{2} that it is up.",
|
||||
x / Constants.RegionSize, y / Constants.RegionSize);
|
||||
m_scene.Name, x / Constants.RegionSize, y / Constants.RegionSize);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -3816,6 +3816,9 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
if (p == null)
|
||||
return;
|
||||
|
||||
ControllingClient.SendTakeControls(controls, false, false);
|
||||
ControllingClient.SendTakeControls(controls, true, false);
|
||||
|
||||
ScriptControllers obj = new ScriptControllers();
|
||||
obj.ignoreControls = ScriptControlled.CONTROL_ZERO;
|
||||
obj.eventControls = ScriptControlled.CONTROL_ZERO;
|
||||
|
|
|
@ -3315,8 +3315,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
{
|
||||
// Unregister controls from Presence
|
||||
presence.UnRegisterControlEventsToScript(m_host.LocalId, m_item.ItemID);
|
||||
// Remove Take Control permission.
|
||||
m_item.PermsMask &= ~ScriptBaseClass.PERMISSION_TAKE_CONTROLS;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -11848,11 +11846,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
ret.Add(new LSL_Vector(opos.X, opos.Y, opos.Z));
|
||||
break;
|
||||
case ScriptBaseClass.OBJECT_ROT:
|
||||
// Quaternion orot = obj.RotationOffset;
|
||||
// ret.Add(new LSL_Rotation(orot.X, orot.Y, orot.Z, orot.W));
|
||||
{
|
||||
Quaternion rot = Quaternion.Identity;
|
||||
|
||||
LSL_Rotation objrot = GetPartRot(obj);
|
||||
ret.Add(objrot);
|
||||
if (obj.ParentGroup.RootPart == obj)
|
||||
rot = obj.ParentGroup.GroupRotation;
|
||||
else
|
||||
rot = obj.GetWorldRotation();
|
||||
|
||||
LSL_Rotation objrot = new LSL_Rotation(rot.X, rot.Y, rot.Z, rot.W);
|
||||
ret.Add(objrot);
|
||||
}
|
||||
break;
|
||||
case ScriptBaseClass.OBJECT_VELOCITY:
|
||||
Vector3 ovel = obj.Velocity;
|
||||
|
|
Loading…
Reference in New Issue