diff options
Diffstat (limited to '')
4 files changed, 62 insertions, 200 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs deleted file mode 100644 index c3f3851..0000000 --- a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs +++ /dev/null | |||
@@ -1,191 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Linq; | ||
31 | using System.Reflection; | ||
32 | using System.Text; | ||
33 | using log4net; | ||
34 | using Mono.Addins; | ||
35 | using Nini.Config; | ||
36 | using OpenMetaverse; | ||
37 | using OpenSim.Framework; | ||
38 | using OpenSim.Framework.Console; | ||
39 | using OpenSim.Framework.Monitoring; | ||
40 | using OpenSim.Region.ClientStack.LindenUDP; | ||
41 | using OpenSim.Region.Framework.Interfaces; | ||
42 | using OpenSim.Region.Framework.Scenes; | ||
43 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
44 | |||
45 | namespace OpenSim.Region.OptionalModules.Avatar.Attachments | ||
46 | { | ||
47 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "TempAttachmentsModule")] | ||
48 | public class TempAttachmentsModule : INonSharedRegionModule | ||
49 | { | ||
50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
51 | |||
52 | private Scene m_scene; | ||
53 | private IRegionConsole m_console; | ||
54 | |||
55 | public void Initialise(IConfigSource configSource) | ||
56 | { | ||
57 | } | ||
58 | |||
59 | public void AddRegion(Scene scene) | ||
60 | { | ||
61 | } | ||
62 | |||
63 | public void RemoveRegion(Scene scene) | ||
64 | { | ||
65 | } | ||
66 | |||
67 | public void RegionLoaded(Scene scene) | ||
68 | { | ||
69 | m_scene = scene; | ||
70 | |||
71 | IScriptModuleComms comms = scene.RequestModuleInterface<IScriptModuleComms>(); | ||
72 | if (comms != null) | ||
73 | { | ||
74 | comms.RegisterScriptInvocation( this, "llAttachToAvatarTemp"); | ||
75 | m_log.DebugFormat("[TEMP ATTACHS]: Registered script functions"); | ||
76 | m_console = scene.RequestModuleInterface<IRegionConsole>(); | ||
77 | |||
78 | if (m_console != null) | ||
79 | { | ||
80 | m_console.AddCommand("TempAttachModule", false, "set auto_grant_attach_perms", "set auto_grant_attach_perms true|false", "Allow objects owned by the region owner or estate managers to obtain attach permissions without asking the user", SetAutoGrantAttachPerms); | ||
81 | } | ||
82 | } | ||
83 | else | ||
84 | { | ||
85 | m_log.ErrorFormat("[TEMP ATTACHS]: Failed to register script functions"); | ||
86 | } | ||
87 | } | ||
88 | |||
89 | public void Close() | ||
90 | { | ||
91 | } | ||
92 | |||
93 | public Type ReplaceableInterface | ||
94 | { | ||
95 | get { return null; } | ||
96 | } | ||
97 | |||
98 | public string Name | ||
99 | { | ||
100 | get { return "TempAttachmentsModule"; } | ||
101 | } | ||
102 | |||
103 | private void SendConsoleOutput(UUID agentID, string text) | ||
104 | { | ||
105 | if (m_console == null) | ||
106 | return; | ||
107 | |||
108 | m_console.SendConsoleOutput(agentID, text); | ||
109 | } | ||
110 | |||
111 | private void SetAutoGrantAttachPerms(string module, string[] parms) | ||
112 | { | ||
113 | UUID agentID = new UUID(parms[parms.Length - 1]); | ||
114 | Array.Resize(ref parms, parms.Length - 1); | ||
115 | |||
116 | if (parms.Length != 3) | ||
117 | { | ||
118 | SendConsoleOutput(agentID, "Command parameter error"); | ||
119 | return; | ||
120 | } | ||
121 | |||
122 | string val = parms[2]; | ||
123 | if (val != "true" && val != "false") | ||
124 | { | ||
125 | SendConsoleOutput(agentID, "Command parameter error"); | ||
126 | return; | ||
127 | } | ||
128 | |||
129 | m_scene.StoreExtraSetting("auto_grant_attach_perms", val); | ||
130 | |||
131 | SendConsoleOutput(agentID, String.Format("auto_grant_attach_perms set to {0}", val)); | ||
132 | } | ||
133 | |||
134 | private int llAttachToAvatarTemp(UUID host, UUID script, int attachmentPoint) | ||
135 | { | ||
136 | SceneObjectPart hostPart = m_scene.GetSceneObjectPart(host); | ||
137 | if (hostPart == null) | ||
138 | return 0; | ||
139 | |||
140 | SceneObjectGroup hostgroup = hostPart.ParentGroup; | ||
141 | |||
142 | if (hostgroup== null || hostgroup.IsAttachment) | ||
143 | return 0; | ||
144 | |||
145 | IAttachmentsModule attachmentsModule = m_scene.RequestModuleInterface<IAttachmentsModule>(); | ||
146 | if (attachmentsModule == null) | ||
147 | return 0; | ||
148 | |||
149 | TaskInventoryItem item = hostPart.Inventory.GetInventoryItem(script); | ||
150 | if (item == null) | ||
151 | return 0; | ||
152 | |||
153 | if ((item.PermsMask & 32) == 0) // PERMISSION_ATTACH | ||
154 | return 0; | ||
155 | |||
156 | ScenePresence target; | ||
157 | if (!m_scene.TryGetScenePresence(item.PermsGranter, out target)) | ||
158 | return 0; | ||
159 | |||
160 | if (target.UUID != hostgroup.OwnerID) | ||
161 | { | ||
162 | uint effectivePerms = hostgroup.EffectiveOwnerPerms; | ||
163 | |||
164 | if ((effectivePerms & (uint)PermissionMask.Transfer) == 0) | ||
165 | return 0; | ||
166 | |||
167 | hostgroup.SetOwner(target.UUID, target.ControllingClient.ActiveGroupId); | ||
168 | |||
169 | if (m_scene.Permissions.PropagatePermissions()) | ||
170 | { | ||
171 | foreach (SceneObjectPart child in hostgroup.Parts) | ||
172 | { | ||
173 | child.Inventory.ChangeInventoryOwner(target.UUID); | ||
174 | child.TriggerScriptChangedEvent(Changed.OWNER); | ||
175 | child.ApplyNextOwnerPermissions(); | ||
176 | } | ||
177 | hostgroup.InvalidateEffectivePerms(); | ||
178 | } | ||
179 | |||
180 | hostgroup.RootPart.ObjectSaleType = 0; | ||
181 | hostgroup.RootPart.SalePrice = 10; | ||
182 | |||
183 | hostgroup.HasGroupChanged = true; | ||
184 | hostgroup.RootPart.SendPropertiesToClient(target.ControllingClient); | ||
185 | hostgroup.RootPart.ScheduleFullUpdate(); | ||
186 | } | ||
187 | |||
188 | return attachmentsModule.AttachObject(target, hostPart.ParentGroup, (uint)attachmentPoint, false, false, true) ? 1 : 0; | ||
189 | } | ||
190 | } | ||
191 | } | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 68804a1..6497d10 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -3864,7 +3864,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3864 | } | 3864 | } |
3865 | } | 3865 | } |
3866 | 3866 | ||
3867 | public void llAttachToAvatar(int attachmentPoint) | 3867 | public void llAttachToAvatar(LSL_Integer attachmentPoint) |
3868 | { | 3868 | { |
3869 | m_host.AddScriptLPS(1); | 3869 | m_host.AddScriptLPS(1); |
3870 | 3870 | ||
@@ -3875,7 +3875,55 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3875 | AttachToAvatar(attachmentPoint); | 3875 | AttachToAvatar(attachmentPoint); |
3876 | } | 3876 | } |
3877 | 3877 | ||
3878 | public void llDetachFromAvatar() | 3878 | public void llAttachToAvatarTemp(LSL_Integer attachmentPoint) |
3879 | { | ||
3880 | IAttachmentsModule attachmentsModule = World.RequestModuleInterface<IAttachmentsModule>(); | ||
3881 | if (attachmentsModule == null) | ||
3882 | return; | ||
3883 | |||
3884 | if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_ATTACH) != 0) | ||
3885 | return; | ||
3886 | |||
3887 | SceneObjectGroup grp = m_host.ParentGroup; | ||
3888 | if (grp == null || grp.IsDeleted || grp.IsAttachment) | ||
3889 | return; | ||
3890 | |||
3891 | ScenePresence target; | ||
3892 | if (!World.TryGetScenePresence(m_item.PermsGranter, out target)) | ||
3893 | return; | ||
3894 | |||
3895 | if (target.UUID != grp.OwnerID) | ||
3896 | { | ||
3897 | uint effectivePerms = grp.EffectiveOwnerPerms; | ||
3898 | |||
3899 | if ((effectivePerms & (uint)PermissionMask.Transfer) == 0) | ||
3900 | return; | ||
3901 | |||
3902 | grp.SetOwner(target.UUID, target.ControllingClient.ActiveGroupId); | ||
3903 | |||
3904 | if (World.Permissions.PropagatePermissions()) | ||
3905 | { | ||
3906 | foreach (SceneObjectPart child in grp.Parts) | ||
3907 | { | ||
3908 | child.Inventory.ChangeInventoryOwner(target.UUID); | ||
3909 | child.TriggerScriptChangedEvent(Changed.OWNER); | ||
3910 | child.ApplyNextOwnerPermissions(); | ||
3911 | } | ||
3912 | grp.InvalidateEffectivePerms(); | ||
3913 | } | ||
3914 | |||
3915 | grp.RootPart.ObjectSaleType = 0; | ||
3916 | grp.RootPart.SalePrice = 10; | ||
3917 | |||
3918 | grp.HasGroupChanged = true; | ||
3919 | grp.RootPart.SendPropertiesToClient(target.ControllingClient); | ||
3920 | grp.RootPart.ScheduleFullUpdate(); | ||
3921 | } | ||
3922 | |||
3923 | attachmentsModule.AttachObject(target, grp, (uint)attachmentPoint, false, false, true); | ||
3924 | } | ||
3925 | |||
3926 | public void llDetachFromAvatar() | ||
3879 | { | 3927 | { |
3880 | m_host.AddScriptLPS(1); | 3928 | m_host.AddScriptLPS(1); |
3881 | 3929 | ||
@@ -7873,7 +7921,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7873 | } | 7921 | } |
7874 | 7922 | ||
7875 | // http://wiki.secondlife.com/wiki/LlAvatarOnLinkSitTarget | 7923 | // http://wiki.secondlife.com/wiki/LlAvatarOnLinkSitTarget |
7876 | public LSL_Key llAvatarOnLinkSitTarget(int linknum) | 7924 | public LSL_Key llAvatarOnLinkSitTarget(LSL_Integer linknum) |
7877 | { | 7925 | { |
7878 | m_host.AddScriptLPS(1); | 7926 | m_host.AddScriptLPS(1); |
7879 | if(linknum == ScriptBaseClass.LINK_SET || | 7927 | if(linknum == ScriptBaseClass.LINK_SET || |
@@ -13052,10 +13100,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
13052 | float time = 0.0f; // default is from start | 13100 | float time = 0.0f; // default is from start |
13053 | 13101 | ||
13054 | ScenePresence presence = null; | 13102 | ScenePresence presence = null; |
13055 | 13103 | int cmd; | |
13056 | for (int i = 0; i < commandList.Data.Length; i++) | 13104 | for (int i = 0; i < commandList.Data.Length; i++) |
13057 | { | 13105 | { |
13058 | int cmd; | ||
13059 | if(commandList.Data[i] is LSL_Integer) | 13106 | if(commandList.Data[i] is LSL_Integer) |
13060 | cmd = (LSL_Integer)commandList.Data[i]; | 13107 | cmd = (LSL_Integer)commandList.Data[i]; |
13061 | else | 13108 | else |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs index 4529d9a..11f6710 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | |||
@@ -52,9 +52,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
52 | void llApplyRotationalImpulse(LSL_Vector force, int local); | 52 | void llApplyRotationalImpulse(LSL_Vector force, int local); |
53 | LSL_Float llAsin(double val); | 53 | LSL_Float llAsin(double val); |
54 | LSL_Float llAtan2(double x, double y); | 54 | LSL_Float llAtan2(double x, double y); |
55 | void llAttachToAvatar(int attachment); | 55 | void llAttachToAvatar(LSL_Integer attachment); |
56 | void llAttachToAvatarTemp(LSL_Integer attachmentPoint); | ||
56 | LSL_Key llAvatarOnSitTarget(); | 57 | LSL_Key llAvatarOnSitTarget(); |
57 | LSL_Key llAvatarOnLinkSitTarget(int linknum); | 58 | LSL_Key llAvatarOnLinkSitTarget(LSL_Integer linknum); |
58 | LSL_Rotation llAxes2Rot(LSL_Vector fwd, LSL_Vector left, LSL_Vector up); | 59 | LSL_Rotation llAxes2Rot(LSL_Vector fwd, LSL_Vector left, LSL_Vector up); |
59 | LSL_Rotation llAxisAngle2Rot(LSL_Vector axis, double angle); | 60 | LSL_Rotation llAxisAngle2Rot(LSL_Vector axis, double angle); |
60 | LSL_Integer llBase64ToInteger(string str); | 61 | LSL_Integer llBase64ToInteger(string str); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index 0b474f4..1511495 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |||
@@ -120,7 +120,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
120 | return m_LSL_Functions.llAtan2(x, y); | 120 | return m_LSL_Functions.llAtan2(x, y); |
121 | } | 121 | } |
122 | 122 | ||
123 | public void llAttachToAvatar(int attachment) | 123 | public void llAttachToAvatar(LSL_Integer attachment) |
124 | { | ||
125 | m_LSL_Functions.llAttachToAvatar(attachment); | ||
126 | } | ||
127 | |||
128 | public void llAttachToAvatarTemp(LSL_Integer attachment) | ||
124 | { | 129 | { |
125 | m_LSL_Functions.llAttachToAvatar(attachment); | 130 | m_LSL_Functions.llAttachToAvatar(attachment); |
126 | } | 131 | } |
@@ -130,7 +135,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
130 | return m_LSL_Functions.llAvatarOnSitTarget(); | 135 | return m_LSL_Functions.llAvatarOnSitTarget(); |
131 | } | 136 | } |
132 | 137 | ||
133 | public LSL_Key llAvatarOnLinkSitTarget(int linknum) | 138 | public LSL_Key llAvatarOnLinkSitTarget(LSL_Integer linknum) |
134 | { | 139 | { |
135 | return m_LSL_Functions.llAvatarOnLinkSitTarget(linknum); | 140 | return m_LSL_Functions.llAvatarOnLinkSitTarget(linknum); |
136 | } | 141 | } |