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

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-07-30 03:20:29 +02:00
parent 7f5ac795be 88d68e68c1
commit 3d7b469c60
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
View File

@ -80,7 +80,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
/// <summary> /// <summary>
/// Maximum number of external urls that can be set up by this module. /// Maximum number of external urls that can be set up by this module.
/// </summary> /// </summary>
private int m_TotalUrls = 5000; private int m_TotalUrls = 15000;
private uint https_port = 0; private uint https_port = 0;
private IHttpServer m_HttpServer = null; private IHttpServer m_HttpServer = null;

2
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
View File

@ -100,7 +100,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
m_log.WarnFormat( m_log.WarnFormat(
"[SCENE COMMUNICATION SERVICE]: Region {0} failed to inform neighbour at {1}-{2} that it is up.", "[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);
} }
} }

3
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -3816,6 +3816,9 @@ namespace OpenSim.Region.Framework.Scenes
if (p == null) if (p == null)
return; return;
ControllingClient.SendTakeControls(controls, false, false);
ControllingClient.SendTakeControls(controls, true, false);
ScriptControllers obj = new ScriptControllers(); ScriptControllers obj = new ScriptControllers();
obj.ignoreControls = ScriptControlled.CONTROL_ZERO; obj.ignoreControls = ScriptControlled.CONTROL_ZERO;
obj.eventControls = ScriptControlled.CONTROL_ZERO; obj.eventControls = ScriptControlled.CONTROL_ZERO;

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

@ -3315,8 +3315,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
// Unregister controls from Presence // Unregister controls from Presence
presence.UnRegisterControlEventsToScript(m_host.LocalId, m_item.ItemID); 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)); ret.Add(new LSL_Vector(opos.X, opos.Y, opos.Z));
break; break;
case ScriptBaseClass.OBJECT_ROT: 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); if (obj.ParentGroup.RootPart == obj)
ret.Add(objrot); 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; break;
case ScriptBaseClass.OBJECT_VELOCITY: case ScriptBaseClass.OBJECT_VELOCITY:
Vector3 ovel = obj.Velocity; Vector3 ovel = obj.Velocity;