diff options
author | Justin Clark-Casey (justincc) | 2011-05-27 21:21:01 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-05-27 21:21:01 +0100 |
commit | b0c9696de0a4f30a4ceab030f369adce57c9bff4 (patch) | |
tree | 496b6e0a7d132f1bcd7c1d2a1bb6085246e4b16f /OpenSim/Region/CoreModules | |
parent | Make sure culture is en-US when saving archive related xml. (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-b0c9696de0a4f30a4ceab030f369adce57c9bff4.zip opensim-SC_OLD-b0c9696de0a4f30a4ceab030f369adce57c9bff4.tar.gz opensim-SC_OLD-b0c9696de0a4f30a4ceab030f369adce57c9bff4.tar.bz2 opensim-SC_OLD-b0c9696de0a4f30a4ceab030f369adce57c9bff4.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
4 files changed, 257 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs index ed02119..e0c404b 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs | |||
@@ -187,7 +187,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
187 | // Is the user a local user? | 187 | // Is the user a local user? |
188 | UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, toAgentID); | 188 | UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, toAgentID); |
189 | string url = string.Empty; | 189 | string url = string.Empty; |
190 | PresenceInfo upd; | ||
191 | if (account == null) // foreign user | 190 | if (account == null) // foreign user |
192 | url = UserManagementModule.GetUserServerURL(toAgentID, "IMServerURI"); | 191 | url = UserManagementModule.GetUserServerURL(toAgentID, "IMServerURI"); |
193 | 192 | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs new file mode 100644 index 0000000..c82cfd2 --- /dev/null +++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | |||
@@ -0,0 +1,244 @@ | |||
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.Reflection; | ||
31 | using log4net; | ||
32 | using Nini.Config; | ||
33 | using OpenMetaverse; | ||
34 | using Mono.Addins; | ||
35 | |||
36 | using OpenSim.Framework; | ||
37 | using OpenSim.Region.Framework.Interfaces; | ||
38 | using OpenSim.Region.Framework.Scenes; | ||
39 | using OpenSim.Services.Connectors.Hypergrid; | ||
40 | |||
41 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | ||
42 | |||
43 | namespace OpenSim.Region.CoreModules.Avatar.Lure | ||
44 | { | ||
45 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | ||
46 | public class HGLureModule : ISharedRegionModule | ||
47 | { | ||
48 | private static readonly ILog m_log = LogManager.GetLogger( | ||
49 | MethodBase.GetCurrentMethod().DeclaringType); | ||
50 | |||
51 | private readonly List<Scene> m_scenes = new List<Scene>(); | ||
52 | |||
53 | private IMessageTransferModule m_TransferModule = null; | ||
54 | private bool m_Enabled = false; | ||
55 | |||
56 | private string m_ThisGridURL; | ||
57 | |||
58 | private ExpiringCache<UUID, GridInstantMessage> m_PendingLures = new ExpiringCache<UUID, GridInstantMessage>(); | ||
59 | |||
60 | public void Initialise(IConfigSource config) | ||
61 | { | ||
62 | if (config.Configs["Messaging"] != null) | ||
63 | { | ||
64 | if (config.Configs["Messaging"].GetString("LureModule", string.Empty) == "HGLureModule") | ||
65 | { | ||
66 | m_Enabled = true; | ||
67 | |||
68 | m_ThisGridURL = config.Configs["Messaging"].GetString("Gatekeeper", string.Empty); | ||
69 | m_log.DebugFormat("[LURE MODULE]: {0} enabled", Name); | ||
70 | } | ||
71 | } | ||
72 | } | ||
73 | |||
74 | public void AddRegion(Scene scene) | ||
75 | { | ||
76 | if (!m_Enabled) | ||
77 | return; | ||
78 | |||
79 | lock (m_scenes) | ||
80 | { | ||
81 | m_scenes.Add(scene); | ||
82 | scene.EventManager.OnIncomingInstantMessage += OnIncomingInstantMessage; | ||
83 | scene.EventManager.OnNewClient += OnNewClient; | ||
84 | } | ||
85 | } | ||
86 | |||
87 | public void RegionLoaded(Scene scene) | ||
88 | { | ||
89 | if (!m_Enabled) | ||
90 | return; | ||
91 | |||
92 | if (m_TransferModule == null) | ||
93 | { | ||
94 | m_TransferModule = | ||
95 | scene.RequestModuleInterface<IMessageTransferModule>(); | ||
96 | |||
97 | if (m_TransferModule == null) | ||
98 | { | ||
99 | m_log.Error("[LURE MODULE]: No message transfer module, lures will not work!"); | ||
100 | |||
101 | m_Enabled = false; | ||
102 | m_scenes.Clear(); | ||
103 | scene.EventManager.OnNewClient -= OnNewClient; | ||
104 | scene.EventManager.OnIncomingInstantMessage -= OnIncomingInstantMessage; | ||
105 | } | ||
106 | } | ||
107 | |||
108 | } | ||
109 | |||
110 | public void RemoveRegion(Scene scene) | ||
111 | { | ||
112 | if (!m_Enabled) | ||
113 | return; | ||
114 | |||
115 | lock (m_scenes) | ||
116 | { | ||
117 | m_scenes.Remove(scene); | ||
118 | scene.EventManager.OnNewClient -= OnNewClient; | ||
119 | scene.EventManager.OnIncomingInstantMessage -= OnIncomingInstantMessage; | ||
120 | } | ||
121 | } | ||
122 | |||
123 | void OnNewClient(IClientAPI client) | ||
124 | { | ||
125 | client.OnInstantMessage += OnInstantMessage; | ||
126 | client.OnStartLure += OnStartLure; | ||
127 | client.OnTeleportLureRequest += OnTeleportLureRequest; | ||
128 | } | ||
129 | |||
130 | public void PostInitialise() | ||
131 | { | ||
132 | } | ||
133 | |||
134 | public void Close() | ||
135 | { | ||
136 | } | ||
137 | |||
138 | public string Name | ||
139 | { | ||
140 | get { return "HGLureModule"; } | ||
141 | } | ||
142 | |||
143 | public Type ReplaceableInterface | ||
144 | { | ||
145 | get { return null; } | ||
146 | } | ||
147 | |||
148 | void OnInstantMessage(IClientAPI client, GridInstantMessage im) | ||
149 | { | ||
150 | } | ||
151 | |||
152 | void OnIncomingInstantMessage(GridInstantMessage im) | ||
153 | { | ||
154 | if (im.dialog == (byte)InstantMessageDialog.RequestTeleport) | ||
155 | { | ||
156 | UUID sessionID = new UUID(im.imSessionID); | ||
157 | m_log.DebugFormat("[HG LURE MODULE]: RequestTeleport sessionID={0}, regionID={1}, message={2}", im.imSessionID, im.RegionID, im.message); | ||
158 | m_PendingLures.Add(sessionID, im, 7200); // 2 hours | ||
159 | |||
160 | // Forward. We do this, because the IM module explicitly rejects | ||
161 | // IMs of this type | ||
162 | if (m_TransferModule != null) | ||
163 | m_TransferModule.SendInstantMessage(im, delegate(bool success) { }); | ||
164 | |||
165 | } | ||
166 | } | ||
167 | |||
168 | public void OnStartLure(byte lureType, string message, UUID targetid, IClientAPI client) | ||
169 | { | ||
170 | if (!(client.Scene is Scene)) | ||
171 | return; | ||
172 | |||
173 | Scene scene = (Scene)(client.Scene); | ||
174 | ScenePresence presence = scene.GetScenePresence(client.AgentId); | ||
175 | |||
176 | message += "@" + m_ThisGridURL; | ||
177 | |||
178 | m_log.DebugFormat("[HG LURE MODULE]: TP invite with message {0}", message); | ||
179 | |||
180 | GridInstantMessage m = new GridInstantMessage(scene, client.AgentId, | ||
181 | client.FirstName+" "+client.LastName, targetid, | ||
182 | (byte)InstantMessageDialog.RequestTeleport, false, | ||
183 | message, UUID.Random(), false, presence.AbsolutePosition, | ||
184 | new Byte[0]); | ||
185 | m.RegionID = client.Scene.RegionInfo.RegionID.Guid; | ||
186 | |||
187 | if (m_TransferModule != null) | ||
188 | { | ||
189 | m_TransferModule.SendInstantMessage(m, | ||
190 | delegate(bool success) { }); | ||
191 | } | ||
192 | } | ||
193 | |||
194 | public void OnTeleportLureRequest(UUID lureID, uint teleportFlags, IClientAPI client) | ||
195 | { | ||
196 | if (!(client.Scene is Scene)) | ||
197 | return; | ||
198 | |||
199 | Scene scene = (Scene)(client.Scene); | ||
200 | |||
201 | GridInstantMessage im = null; | ||
202 | if (m_PendingLures.TryGetValue(lureID, out im)) | ||
203 | { | ||
204 | m_PendingLures.Remove(lureID); | ||
205 | Lure(client, teleportFlags, im); | ||
206 | } | ||
207 | else | ||
208 | m_log.DebugFormat("[HG LURE MODULE]: pending lure {0} not found", lureID); | ||
209 | |||
210 | } | ||
211 | |||
212 | private void Lure(IClientAPI client, uint teleportflags, GridInstantMessage im) | ||
213 | { | ||
214 | Scene scene = (Scene)(client.Scene); | ||
215 | GridRegion region = scene.GridService.GetRegionByUUID(scene.RegionInfo.ScopeID, new UUID(im.RegionID)); | ||
216 | if (region != null) | ||
217 | scene.RequestTeleportLocation(client, region.RegionHandle, im.Position + new Vector3(0.5f, 0.5f, 0f), Vector3.UnitX, teleportflags); | ||
218 | else // we don't have that region here. Check if it's HG | ||
219 | { | ||
220 | string[] parts = im.message.Split(new char[] { '@' }); | ||
221 | if (parts.Length > 1) | ||
222 | { | ||
223 | string url = parts[parts.Length - 1]; // the last part | ||
224 | if (url.Trim(new char[] {'/'}) != m_ThisGridURL.Trim(new char[] {'/'})) | ||
225 | { | ||
226 | m_log.DebugFormat("[HG LURE MODULE]: Luring agent to grid {0} region {1} position {2}", url, im.RegionID, im.Position); | ||
227 | GatekeeperServiceConnector gConn = new GatekeeperServiceConnector(); | ||
228 | GridRegion gatekeeper = new GridRegion(); | ||
229 | gatekeeper.ServerURI = url; | ||
230 | GridRegion finalDestination = gConn.GetHyperlinkRegion(gatekeeper, new UUID(im.RegionID)); | ||
231 | if (finalDestination != null) | ||
232 | { | ||
233 | ScenePresence sp = scene.GetScenePresence(client.AgentId); | ||
234 | IEntityTransferModule transferMod = scene.RequestModuleInterface<IEntityTransferModule>(); | ||
235 | IEventQueue eq = sp.Scene.RequestModuleInterface<IEventQueue>(); | ||
236 | if (transferMod != null && sp != null && eq != null) | ||
237 | transferMod.DoTeleport(sp, gatekeeper, finalDestination, im.Position + new Vector3(0.5f, 0.5f, 0f), Vector3.UnitX, teleportflags, eq); | ||
238 | } | ||
239 | } | ||
240 | } | ||
241 | } | ||
242 | } | ||
243 | } | ||
244 | } | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs index d1d7df2..d295384 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | |||
@@ -45,16 +45,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure | |||
45 | private readonly List<Scene> m_scenes = new List<Scene>(); | 45 | private readonly List<Scene> m_scenes = new List<Scene>(); |
46 | 46 | ||
47 | private IMessageTransferModule m_TransferModule = null; | 47 | private IMessageTransferModule m_TransferModule = null; |
48 | private bool m_Enabled = true; | 48 | private bool m_Enabled = false; |
49 | 49 | ||
50 | public void Initialise(IConfigSource config) | 50 | public void Initialise(IConfigSource config) |
51 | { | 51 | { |
52 | if (config.Configs["Messaging"] != null) | 52 | if (config.Configs["Messaging"] != null) |
53 | { | 53 | { |
54 | if (config.Configs["Messaging"].GetString( | 54 | if (config.Configs["Messaging"].GetString( |
55 | "LureModule", "LureModule") != | 55 | "LureModule", "LureModule") == |
56 | "LureModule") | 56 | "LureModule") |
57 | m_Enabled = false; | 57 | { |
58 | m_Enabled = true; | ||
59 | m_log.DebugFormat("[LURE MODULE]: {0} enabled", Name); | ||
60 | } | ||
58 | } | 61 | } |
59 | } | 62 | } |
60 | 63 | ||
@@ -74,6 +77,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure | |||
74 | 77 | ||
75 | public void RegionLoaded(Scene scene) | 78 | public void RegionLoaded(Scene scene) |
76 | { | 79 | { |
80 | if (!m_Enabled) | ||
81 | return; | ||
82 | |||
77 | if (m_TransferModule == null) | 83 | if (m_TransferModule == null) |
78 | { | 84 | { |
79 | m_TransferModule = | 85 | m_TransferModule = |
@@ -96,6 +102,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure | |||
96 | 102 | ||
97 | public void RemoveRegion(Scene scene) | 103 | public void RemoveRegion(Scene scene) |
98 | { | 104 | { |
105 | if (!m_Enabled) | ||
106 | return; | ||
107 | |||
99 | lock (m_scenes) | 108 | lock (m_scenes) |
100 | { | 109 | { |
101 | m_scenes.Remove(scene); | 110 | m_scenes.Remove(scene); |
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 6e4ec81..ec084fb 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -248,7 +248,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
248 | } | 248 | } |
249 | } | 249 | } |
250 | 250 | ||
251 | protected void DoTeleport(ScenePresence sp, GridRegion reg, GridRegion finalDestination, Vector3 position, Vector3 lookAt, uint teleportFlags, IEventQueue eq) | 251 | public void DoTeleport(ScenePresence sp, GridRegion reg, GridRegion finalDestination, Vector3 position, Vector3 lookAt, uint teleportFlags, IEventQueue eq) |
252 | { | 252 | { |
253 | if (reg == null || finalDestination == null) | 253 | if (reg == null || finalDestination == null) |
254 | { | 254 | { |