diff options
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs | 189 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | 24 |
2 files changed, 201 insertions, 12 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs new file mode 100644 index 0000000..417b620 --- /dev/null +++ b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs | |||
@@ -0,0 +1,189 @@ | |||
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 | |||
44 | namespace OpenSim.Region.OptionalModules.Avatar.Attachments | ||
45 | { | ||
46 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "TempAttachmentsModule")] | ||
47 | public class TempAttachmentsModule : INonSharedRegionModule | ||
48 | { | ||
49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
50 | |||
51 | private Scene m_scene; | ||
52 | private IRegionConsole m_console; | ||
53 | |||
54 | public void Initialise(IConfigSource configSource) | ||
55 | { | ||
56 | } | ||
57 | |||
58 | public void AddRegion(Scene scene) | ||
59 | { | ||
60 | } | ||
61 | |||
62 | public void RemoveRegion(Scene scene) | ||
63 | { | ||
64 | } | ||
65 | |||
66 | public void RegionLoaded(Scene scene) | ||
67 | { | ||
68 | m_scene = scene; | ||
69 | |||
70 | IScriptModuleComms comms = scene.RequestModuleInterface<IScriptModuleComms>(); | ||
71 | if (comms != null) | ||
72 | { | ||
73 | comms.RegisterScriptInvocation( this, "llAttachToAvatarTemp"); | ||
74 | m_log.DebugFormat("[TEMP ATTACHS]: Registered script functions"); | ||
75 | m_console = scene.RequestModuleInterface<IRegionConsole>(); | ||
76 | |||
77 | if (m_console != null) | ||
78 | { | ||
79 | m_console.AddCommand("TempATtachModule", false, "set auto_grant_attach_perms", "set auto_grant_attach_perms true|false", "Allow objects owned by the region owner os estate managers to obtain attach permissions without asking the user", SetAutoGrantAttachPerms); | ||
80 | } | ||
81 | } | ||
82 | else | ||
83 | { | ||
84 | m_log.ErrorFormat("[TEMP ATTACHS]: Failed to register script functions"); | ||
85 | } | ||
86 | } | ||
87 | |||
88 | public void Close() | ||
89 | { | ||
90 | } | ||
91 | |||
92 | public Type ReplaceableInterface | ||
93 | { | ||
94 | get { return null; } | ||
95 | } | ||
96 | |||
97 | public string Name | ||
98 | { | ||
99 | get { return "TempAttachmentsModule"; } | ||
100 | } | ||
101 | |||
102 | private void SendConsoleOutput(UUID agentID, string text) | ||
103 | { | ||
104 | if (m_console == null) | ||
105 | return; | ||
106 | |||
107 | m_console.SendConsoleOutput(agentID, text); | ||
108 | } | ||
109 | |||
110 | private void SetAutoGrantAttachPerms(string module, string[] parms) | ||
111 | { | ||
112 | UUID agentID = new UUID(parms[parms.Length - 1]); | ||
113 | Array.Resize(ref parms, parms.Length - 1); | ||
114 | |||
115 | if (parms.Length != 3) | ||
116 | { | ||
117 | SendConsoleOutput(agentID, "Command parameter error"); | ||
118 | return; | ||
119 | } | ||
120 | |||
121 | string val = parms[2]; | ||
122 | if (val != "true" && val != "false") | ||
123 | { | ||
124 | SendConsoleOutput(agentID, "Command parameter error"); | ||
125 | return; | ||
126 | } | ||
127 | |||
128 | m_scene.StoreExtraSetting("auto_grant_attach_perms", val); | ||
129 | |||
130 | SendConsoleOutput(agentID, String.Format("auto_grant_attach_perms set to {0}", val)); | ||
131 | } | ||
132 | |||
133 | private void llAttachToAvatarTemp(UUID host, UUID script, int attachmentPoint) | ||
134 | { | ||
135 | SceneObjectPart hostPart = m_scene.GetSceneObjectPart(host); | ||
136 | |||
137 | if (hostPart == null) | ||
138 | return; | ||
139 | |||
140 | if (hostPart.ParentGroup.IsAttachment) | ||
141 | return; | ||
142 | |||
143 | IAttachmentsModule attachmentsModule = m_scene.RequestModuleInterface<IAttachmentsModule>(); | ||
144 | if (attachmentsModule == null) | ||
145 | return; | ||
146 | |||
147 | TaskInventoryItem item = hostPart.Inventory.GetInventoryItem(script); | ||
148 | if (item == null) | ||
149 | return; | ||
150 | |||
151 | if ((item.PermsMask & 32) == 0) // PERMISSION_ATTACH | ||
152 | return; | ||
153 | |||
154 | ScenePresence target; | ||
155 | if (!m_scene.TryGetScenePresence(item.PermsGranter, out target)) | ||
156 | return; | ||
157 | |||
158 | if (target.UUID != hostPart.ParentGroup.OwnerID) | ||
159 | { | ||
160 | uint effectivePerms = hostPart.ParentGroup.GetEffectivePermissions(); | ||
161 | |||
162 | if ((effectivePerms & (uint)PermissionMask.Transfer) == 0) | ||
163 | return; | ||
164 | |||
165 | hostPart.ParentGroup.SetOwnerId(target.UUID); | ||
166 | hostPart.ParentGroup.SetRootPartOwner(hostPart.ParentGroup.RootPart, target.UUID, target.ControllingClient.ActiveGroupId); | ||
167 | |||
168 | if (m_scene.Permissions.PropagatePermissions()) | ||
169 | { | ||
170 | foreach (SceneObjectPart child in hostPart.ParentGroup.Parts) | ||
171 | { | ||
172 | child.Inventory.ChangeInventoryOwner(target.UUID); | ||
173 | child.TriggerScriptChangedEvent(Changed.OWNER); | ||
174 | child.ApplyNextOwnerPermissions(); | ||
175 | } | ||
176 | } | ||
177 | |||
178 | hostPart.ParentGroup.RootPart.ObjectSaleType = 0; | ||
179 | hostPart.ParentGroup.RootPart.SalePrice = 10; | ||
180 | |||
181 | hostPart.ParentGroup.HasGroupChanged = true; | ||
182 | hostPart.ParentGroup.RootPart.SendPropertiesToClient(target.ControllingClient); | ||
183 | hostPart.ParentGroup.RootPart.ScheduleFullUpdate(); | ||
184 | } | ||
185 | |||
186 | attachmentsModule.AttachObject(target, hostPart.ParentGroup, (uint)attachmentPoint, false, true, true); | ||
187 | } | ||
188 | } | ||
189 | } | ||
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index 396d4c5..a30a38d 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | |||
@@ -469,8 +469,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
469 | avatarName = avatar.Name; | 469 | avatarName = avatar.Name; |
470 | 470 | ||
471 | m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: scene = {0}, agentID = {1}", scene, agentID); | 471 | m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: scene = {0}, agentID = {1}", scene, agentID); |
472 | m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: request: {0}, path: {1}, param: {2}", | 472 | // m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: request: {0}, path: {1}, param: {2}", |
473 | request, path, param); | 473 | // request, path, param); |
474 | 474 | ||
475 | XmlElement resp; | 475 | XmlElement resp; |
476 | bool retry = false; | 476 | bool retry = false; |
@@ -577,7 +577,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
577 | 577 | ||
578 | string r = LLSDHelpers.SerialiseLLSDReply(voiceAccountResponse); | 578 | string r = LLSDHelpers.SerialiseLLSDReply(voiceAccountResponse); |
579 | 579 | ||
580 | m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: avatar \"{0}\": {1}", avatarName, r); | 580 | // m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: avatar \"{0}\": {1}", avatarName, r); |
581 | 581 | ||
582 | return r; | 582 | return r; |
583 | } | 583 | } |
@@ -625,8 +625,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
625 | // voice channel | 625 | // voice channel |
626 | LandData land = scene.GetLandData(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); | 626 | LandData land = scene.GetLandData(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); |
627 | 627 | ||
628 | m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": request: {4}, path: {5}, param: {6}", | 628 | // m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": request: {4}, path: {5}, param: {6}", |
629 | scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param); | 629 | // scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param); |
630 | // m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: avatar \"{0}\": location: {1} {2} {3}", | 630 | // m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: avatar \"{0}\": location: {1} {2} {3}", |
631 | // avatarName, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z); | 631 | // avatarName, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z); |
632 | 632 | ||
@@ -656,8 +656,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
656 | parcelVoiceInfo = new LLSDParcelVoiceInfoResponse(scene.RegionInfo.RegionName, land.LocalID, creds); | 656 | parcelVoiceInfo = new LLSDParcelVoiceInfoResponse(scene.RegionInfo.RegionName, land.LocalID, creds); |
657 | string r = LLSDHelpers.SerialiseLLSDReply(parcelVoiceInfo); | 657 | string r = LLSDHelpers.SerialiseLLSDReply(parcelVoiceInfo); |
658 | 658 | ||
659 | m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": {4}", | 659 | // m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": {4}", |
660 | scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, r); | 660 | // scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, r); |
661 | return r; | 661 | return r; |
662 | } | 662 | } |
663 | catch (Exception e) | 663 | catch (Exception e) |
@@ -684,11 +684,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
684 | public string ChatSessionRequest(Scene scene, string request, string path, string param, | 684 | public string ChatSessionRequest(Scene scene, string request, string path, string param, |
685 | UUID agentID, Caps caps) | 685 | UUID agentID, Caps caps) |
686 | { | 686 | { |
687 | ScenePresence avatar = scene.GetScenePresence(agentID); | 687 | // ScenePresence avatar = scene.GetScenePresence(agentID); |
688 | string avatarName = avatar.Name; | 688 | // string avatarName = avatar.Name; |
689 | 689 | ||
690 | m_log.DebugFormat("[VivoxVoice][CHATSESSION]: avatar \"{0}\": request: {1}, path: {2}, param: {3}", | 690 | // m_log.DebugFormat("[VivoxVoice][CHATSESSION]: avatar \"{0}\": request: {1}, path: {2}, param: {3}", |
691 | avatarName, request, path, param); | 691 | // avatarName, request, path, param); |
692 | return "<llsd>true</llsd>"; | 692 | return "<llsd>true</llsd>"; |
693 | } | 693 | } |
694 | 694 | ||
@@ -1119,7 +1119,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
1119 | try | 1119 | try |
1120 | { | 1120 | { |
1121 | // Otherwise prepare the request | 1121 | // Otherwise prepare the request |
1122 | m_log.DebugFormat("[VivoxVoice] Sending request <{0}>", requrl); | 1122 | // m_log.DebugFormat("[VivoxVoice] Sending request <{0}>", requrl); |
1123 | 1123 | ||
1124 | HttpWebRequest req = (HttpWebRequest)WebRequest.Create(requrl); | 1124 | HttpWebRequest req = (HttpWebRequest)WebRequest.Create(requrl); |
1125 | HttpWebResponse rsp = null; | 1125 | HttpWebResponse rsp = null; |