diff options
author | ubit | 2012-07-30 03:20:29 +0200 |
---|---|---|
committer | ubit | 2012-07-30 03:20:29 +0200 |
commit | 3d7b469c60bbc90aacd090d80aa1dc4e4177d022 (patch) | |
tree | 4a72ce6dfca61d4a0da91fb0d362e0ccb096b906 | |
parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
parent | Return world rotation on llGetObjectDetails()'s OBJECT_ROT (diff) | |
download | opensim-SC-3d7b469c60bbc90aacd090d80aa1dc4e4177d022.zip opensim-SC-3d7b469c60bbc90aacd090d80aa1dc4e4177d022.tar.gz opensim-SC-3d7b469c60bbc90aacd090d80aa1dc4e4177d022.tar.bz2 opensim-SC-3d7b469c60bbc90aacd090d80aa1dc4e4177d022.tar.xz |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
4 files changed, 15 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index f4a89bd..e0e358a 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
@@ -80,7 +80,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
80 | /// <summary> | 80 | /// <summary> |
81 | /// Maximum number of external urls that can be set up by this module. | 81 | /// Maximum number of external urls that can be set up by this module. |
82 | /// </summary> | 82 | /// </summary> |
83 | private int m_TotalUrls = 5000; | 83 | private int m_TotalUrls = 15000; |
84 | 84 | ||
85 | private uint https_port = 0; | 85 | private uint https_port = 0; |
86 | private IHttpServer m_HttpServer = null; | 86 | private IHttpServer m_HttpServer = null; |
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 5d8447b..775a4c2 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
@@ -100,7 +100,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
100 | { | 100 | { |
101 | m_log.WarnFormat( | 101 | m_log.WarnFormat( |
102 | "[SCENE COMMUNICATION SERVICE]: Region {0} failed to inform neighbour at {1}-{2} that it is up.", | 102 | "[SCENE COMMUNICATION SERVICE]: Region {0} failed to inform neighbour at {1}-{2} that it is up.", |
103 | x / Constants.RegionSize, y / Constants.RegionSize); | 103 | m_scene.Name, x / Constants.RegionSize, y / Constants.RegionSize); |
104 | } | 104 | } |
105 | } | 105 | } |
106 | 106 | ||
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index e27d309..89df0ce 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3816,6 +3816,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
3816 | if (p == null) | 3816 | if (p == null) |
3817 | return; | 3817 | return; |
3818 | 3818 | ||
3819 | ControllingClient.SendTakeControls(controls, false, false); | ||
3820 | ControllingClient.SendTakeControls(controls, true, false); | ||
3821 | |||
3819 | ScriptControllers obj = new ScriptControllers(); | 3822 | ScriptControllers obj = new ScriptControllers(); |
3820 | obj.ignoreControls = ScriptControlled.CONTROL_ZERO; | 3823 | obj.ignoreControls = ScriptControlled.CONTROL_ZERO; |
3821 | obj.eventControls = ScriptControlled.CONTROL_ZERO; | 3824 | obj.eventControls = ScriptControlled.CONTROL_ZERO; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 2425646..cd72dc2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -3315,8 +3315,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3315 | { | 3315 | { |
3316 | // Unregister controls from Presence | 3316 | // Unregister controls from Presence |
3317 | presence.UnRegisterControlEventsToScript(m_host.LocalId, m_item.ItemID); | 3317 | presence.UnRegisterControlEventsToScript(m_host.LocalId, m_item.ItemID); |
3318 | // Remove Take Control permission. | ||
3319 | m_item.PermsMask &= ~ScriptBaseClass.PERMISSION_TAKE_CONTROLS; | ||
3320 | } | 3318 | } |
3321 | } | 3319 | } |
3322 | } | 3320 | } |
@@ -11848,11 +11846,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11848 | ret.Add(new LSL_Vector(opos.X, opos.Y, opos.Z)); | 11846 | ret.Add(new LSL_Vector(opos.X, opos.Y, opos.Z)); |
11849 | break; | 11847 | break; |
11850 | case ScriptBaseClass.OBJECT_ROT: | 11848 | case ScriptBaseClass.OBJECT_ROT: |
11851 | // Quaternion orot = obj.RotationOffset; | 11849 | { |
11852 | // ret.Add(new LSL_Rotation(orot.X, orot.Y, orot.Z, orot.W)); | 11850 | Quaternion rot = Quaternion.Identity; |
11851 | |||
11852 | if (obj.ParentGroup.RootPart == obj) | ||
11853 | rot = obj.ParentGroup.GroupRotation; | ||
11854 | else | ||
11855 | rot = obj.GetWorldRotation(); | ||
11853 | 11856 | ||
11854 | LSL_Rotation objrot = GetPartRot(obj); | 11857 | LSL_Rotation objrot = new LSL_Rotation(rot.X, rot.Y, rot.Z, rot.W); |
11855 | ret.Add(objrot); | 11858 | ret.Add(objrot); |
11859 | } | ||
11856 | break; | 11860 | break; |
11857 | case ScriptBaseClass.OBJECT_VELOCITY: | 11861 | case ScriptBaseClass.OBJECT_VELOCITY: |
11858 | Vector3 ovel = obj.Velocity; | 11862 | Vector3 ovel = obj.Velocity; |