diff options
author | Jeff Ames | 2008-08-25 14:40:10 +0000 |
---|---|---|
committer | Jeff Ames | 2008-08-25 14:40:10 +0000 |
commit | 41f616627f4658df8157c340f0d74393a852e7e6 (patch) | |
tree | 7c5e7f9cde37a731ab30f2ff73b08388ddce8197 /OpenSim | |
parent | Fix osAvatarPlayAnimation to actually do what it says on the box (diff) | |
download | opensim-SC-41f616627f4658df8157c340f0d74393a852e7e6.zip opensim-SC-41f616627f4658df8157c340f0d74393a852e7e6.tar.gz opensim-SC-41f616627f4658df8157c340f0d74393a852e7e6.tar.bz2 opensim-SC-41f616627f4658df8157c340f0d74393a852e7e6.tar.xz |
Update svn properties.
Diffstat (limited to 'OpenSim')
4 files changed, 987 insertions, 987 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMethodString.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMethodString.cs index 31325d8..c68dd96 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDMethodString.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDMethodString.cs | |||
@@ -1,31 +1,31 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSim Project nor the | 12 | * * Neither the name of the OpenSim Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 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 | 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 | 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 | 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. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | namespace OpenSim.Framework.Communications.Capabilities | 28 | namespace OpenSim.Framework.Communications.Capabilities |
29 | { | 29 | { |
30 | public delegate TResponse LLSDMethodString<TRequest, TResponse>(TRequest request, string path); | 30 | public delegate TResponse LLSDMethodString<TRequest, TResponse>(TRequest request, string path); |
31 | } | 31 | } |
diff --git a/OpenSim/Framework/Servers/LLSDMethodString.cs b/OpenSim/Framework/Servers/LLSDMethodString.cs index 8d20b69..09736ba 100644 --- a/OpenSim/Framework/Servers/LLSDMethodString.cs +++ b/OpenSim/Framework/Servers/LLSDMethodString.cs | |||
@@ -1,33 +1,33 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSim Project nor the | 12 | * * Neither the name of the OpenSim Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 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 | 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 | 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 | 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. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using libsecondlife.StructuredData; | 28 | using libsecondlife.StructuredData; |
29 | 29 | ||
30 | namespace OpenSim.Framework.Servers | 30 | namespace OpenSim.Framework.Servers |
31 | { | 31 | { |
32 | public delegate LLSD LLSDMethodString(LLSD request, string thePath); | 32 | public delegate LLSD LLSDMethodString(LLSD request, string thePath); |
33 | } | 33 | } |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs b/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs index dfdabc8..864cb4e 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs | |||
@@ -1,42 +1,42 @@ | |||
1 | using System; | 1 | using System; |
2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
3 | using System.Text; | 3 | using System.Text; |
4 | using libsecondlife.Packets; | 4 | using libsecondlife.Packets; |
5 | 5 | ||
6 | namespace OpenSim.Region.ClientStack.LindenUDP | 6 | namespace OpenSim.Region.ClientStack.LindenUDP |
7 | { | 7 | { |
8 | class KillPacket : Packet | 8 | class KillPacket : Packet |
9 | { | 9 | { |
10 | private Header header; | 10 | private Header header; |
11 | public override void FromBytes(Header header, byte[] bytes, ref int i, ref int packetEnd, byte[] zeroBuffer) | 11 | public override void FromBytes(Header header, byte[] bytes, ref int i, ref int packetEnd, byte[] zeroBuffer) |
12 | { | 12 | { |
13 | 13 | ||
14 | } | 14 | } |
15 | 15 | ||
16 | public override void FromBytes(byte[] bytes, ref int i, ref int packetEnd, byte[] zeroBuffer) | 16 | public override void FromBytes(byte[] bytes, ref int i, ref int packetEnd, byte[] zeroBuffer) |
17 | { | 17 | { |
18 | 18 | ||
19 | } | 19 | } |
20 | 20 | ||
21 | public override Header Header { get { return header; } set { header = value; }} | 21 | public override Header Header { get { return header; } set { header = value; }} |
22 | 22 | ||
23 | public override byte[] ToBytes() | 23 | public override byte[] ToBytes() |
24 | { | 24 | { |
25 | return new byte[0]; | 25 | return new byte[0]; |
26 | } | 26 | } |
27 | public KillPacket() | 27 | public KillPacket() |
28 | { | 28 | { |
29 | Header = new LowHeader(); | 29 | Header = new LowHeader(); |
30 | Header.ID = 65531; | 30 | Header.ID = 65531; |
31 | Header.Reliable = true; | 31 | Header.Reliable = true; |
32 | } | 32 | } |
33 | 33 | ||
34 | public override PacketType Type | 34 | public override PacketType Type |
35 | { | 35 | { |
36 | get | 36 | get |
37 | { | 37 | { |
38 | return PacketType.UseCircuitCode; | 38 | return PacketType.UseCircuitCode; |
39 | } | 39 | } |
40 | } | 40 | } |
41 | } | 41 | } |
42 | } | 42 | } |
diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs index ffde9f2..746828a 100644 --- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs | |||
@@ -1,881 +1,881 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSim Project nor the | 12 | * * Neither the name of the OpenSim Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 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 | 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 | 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 | 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. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | using System; | 27 | using System; |
28 | using System.Collections; | 28 | using System.Collections; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Net; | 31 | using System.Net; |
32 | using System.Net.Security; | 32 | using System.Net.Security; |
33 | using System.Net.Sockets; | 33 | using System.Net.Sockets; |
34 | using System.Reflection; | 34 | using System.Reflection; |
35 | using System.Text.RegularExpressions; | 35 | using System.Text.RegularExpressions; |
36 | using System.Threading; | 36 | using System.Threading; |
37 | 37 | ||
38 | using libsecondlife; | 38 | using libsecondlife; |
39 | using libsecondlife.StructuredData; | 39 | using libsecondlife.StructuredData; |
40 | 40 | ||
41 | using log4net; | 41 | using log4net; |
42 | using Nini.Config; | 42 | using Nini.Config; |
43 | using Nwc.XmlRpc; | 43 | using Nwc.XmlRpc; |
44 | 44 | ||
45 | using OpenSim.Framework; | 45 | using OpenSim.Framework; |
46 | using OpenSim.Region.Environment.Interfaces; | 46 | using OpenSim.Region.Environment.Interfaces; |
47 | using OpenSim.Region.Environment.Scenes; | 47 | using OpenSim.Region.Environment.Scenes; |
48 | using OpenSim.Framework.Communications.Cache; | 48 | using OpenSim.Framework.Communications.Cache; |
49 | using OpenSim.Framework.Communications.Capabilities; | 49 | using OpenSim.Framework.Communications.Capabilities; |
50 | using OpenSim.Framework.Statistics; | 50 | using OpenSim.Framework.Statistics; |
51 | using LLSD = libsecondlife.StructuredData.LLSD; | 51 | using LLSD = libsecondlife.StructuredData.LLSD; |
52 | using LLSDMap = libsecondlife.StructuredData.LLSDMap; | 52 | using LLSDMap = libsecondlife.StructuredData.LLSDMap; |
53 | using LLSDArray = libsecondlife.StructuredData.LLSDArray; | 53 | using LLSDArray = libsecondlife.StructuredData.LLSDArray; |
54 | 54 | ||
55 | namespace OpenSim.Region.Environment.Modules.InterGrid | 55 | namespace OpenSim.Region.Environment.Modules.InterGrid |
56 | { | 56 | { |
57 | public struct OGPState | 57 | public struct OGPState |
58 | { | 58 | { |
59 | public string first_name; | 59 | public string first_name; |
60 | public string last_name; | 60 | public string last_name; |
61 | public LLUUID agent_id; | 61 | public LLUUID agent_id; |
62 | public LLUUID local_agent_id; | 62 | public LLUUID local_agent_id; |
63 | public LLUUID region_id; | 63 | public LLUUID region_id; |
64 | public uint circuit_code; | 64 | public uint circuit_code; |
65 | public LLUUID secure_session_id; | 65 | public LLUUID secure_session_id; |
66 | public LLUUID session_id; | 66 | public LLUUID session_id; |
67 | public bool agent_access; | 67 | public bool agent_access; |
68 | public string sim_access; | 68 | public string sim_access; |
69 | public uint god_level; | 69 | public uint god_level; |
70 | public bool god_overide; | 70 | public bool god_overide; |
71 | public bool identified; | 71 | public bool identified; |
72 | public bool transacted; | 72 | public bool transacted; |
73 | public bool age_verified; | 73 | public bool age_verified; |
74 | public bool allow_redirect; | 74 | public bool allow_redirect; |
75 | public int limited_to_estate; | 75 | public int limited_to_estate; |
76 | public string inventory_host; | 76 | public string inventory_host; |
77 | public bool src_can_see_mainland; | 77 | public bool src_can_see_mainland; |
78 | public int src_estate_id; | 78 | public int src_estate_id; |
79 | } | 79 | } |
80 | 80 | ||
81 | 81 | ||
82 | public class OpenGridProtocolModule : IRegionModule | 82 | public class OpenGridProtocolModule : IRegionModule |
83 | { | 83 | { |
84 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 84 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
85 | private List<Scene> m_scene = new List<Scene>(); | 85 | private List<Scene> m_scene = new List<Scene>(); |
86 | 86 | ||
87 | private Dictionary<string, AgentCircuitData> CapsLoginID = new Dictionary<string, AgentCircuitData>(); | 87 | private Dictionary<string, AgentCircuitData> CapsLoginID = new Dictionary<string, AgentCircuitData>(); |
88 | private Dictionary<LLUUID, OGPState> m_OGPState = new Dictionary<LLUUID, OGPState>(); | 88 | private Dictionary<LLUUID, OGPState> m_OGPState = new Dictionary<LLUUID, OGPState>(); |
89 | 89 | ||
90 | 90 | ||
91 | 91 | ||
92 | #region IRegionModule Members | 92 | #region IRegionModule Members |
93 | 93 | ||
94 | public void Initialise(Scene scene, IConfigSource config) | 94 | public void Initialise(Scene scene, IConfigSource config) |
95 | { | 95 | { |
96 | bool enabled = false; | 96 | bool enabled = false; |
97 | IConfig cfg = null; | 97 | IConfig cfg = null; |
98 | try | 98 | try |
99 | { | 99 | { |
100 | cfg = config.Configs["OpenGridProtocol"]; | 100 | cfg = config.Configs["OpenGridProtocol"]; |
101 | } catch (NullReferenceException) | 101 | } catch (NullReferenceException) |
102 | { | 102 | { |
103 | enabled = false; | 103 | enabled = false; |
104 | } | 104 | } |
105 | if (cfg != null) | 105 | if (cfg != null) |
106 | { | 106 | { |
107 | enabled = cfg.GetBoolean("ogp_enabled", false); | 107 | enabled = cfg.GetBoolean("ogp_enabled", false); |
108 | if (enabled) | 108 | if (enabled) |
109 | { | 109 | { |
110 | m_log.Warn("[OGP]: Open Grid Protocol is on, Listening for Clients on /agent/"); | 110 | m_log.Warn("[OGP]: Open Grid Protocol is on, Listening for Clients on /agent/"); |
111 | lock (m_scene) | 111 | lock (m_scene) |
112 | { | 112 | { |
113 | if (m_scene.Count == 0) | 113 | if (m_scene.Count == 0) |
114 | { | 114 | { |
115 | scene.AddLLSDHandler("/agent/", ProcessAgentDomainMessage); | 115 | scene.AddLLSDHandler("/agent/", ProcessAgentDomainMessage); |
116 | } | 116 | } |
117 | 117 | ||
118 | if (!m_scene.Contains(scene)) | 118 | if (!m_scene.Contains(scene)) |
119 | m_scene.Add(scene); | 119 | m_scene.Add(scene); |
120 | } | 120 | } |
121 | } | 121 | } |
122 | } | 122 | } |
123 | // Of interest to this module potentially | 123 | // Of interest to this module potentially |
124 | //scene.EventManager.OnNewClient += OnNewClient; | 124 | //scene.EventManager.OnNewClient += OnNewClient; |
125 | //scene.EventManager.OnGridInstantMessageToFriendsModule += OnGridInstantMessage; | 125 | //scene.EventManager.OnGridInstantMessageToFriendsModule += OnGridInstantMessage; |
126 | //scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel; | 126 | //scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel; |
127 | //scene.EventManager.OnMakeChildAgent += MakeChildAgent; | 127 | //scene.EventManager.OnMakeChildAgent += MakeChildAgent; |
128 | //scene.EventManager.OnClientClosed += ClientLoggedOut; | 128 | //scene.EventManager.OnClientClosed += ClientLoggedOut; |
129 | } | 129 | } |
130 | 130 | ||
131 | public void PostInitialise() | 131 | public void PostInitialise() |
132 | { | 132 | { |
133 | } | 133 | } |
134 | 134 | ||
135 | public void Close() | 135 | public void Close() |
136 | { | 136 | { |
137 | } | 137 | } |
138 | 138 | ||
139 | public string Name | 139 | public string Name |
140 | { | 140 | { |
141 | get { return "OpenGridProtocolModule"; } | 141 | get { return "OpenGridProtocolModule"; } |
142 | } | 142 | } |
143 | 143 | ||
144 | public bool IsSharedModule | 144 | public bool IsSharedModule |
145 | { | 145 | { |
146 | get { return true; } | 146 | get { return true; } |
147 | } | 147 | } |
148 | 148 | ||
149 | #endregion | 149 | #endregion |
150 | 150 | ||
151 | public LLSD ProcessAgentDomainMessage(string path, LLSD request, string endpoint) | 151 | public LLSD ProcessAgentDomainMessage(string path, LLSD request, string endpoint) |
152 | { | 152 | { |
153 | // /agent/* | 153 | // /agent/* |
154 | 154 | ||
155 | string[] pathSegments = path.Split('/'); | 155 | string[] pathSegments = path.Split('/'); |
156 | if (pathSegments.Length < 1) | 156 | if (pathSegments.Length < 1) |
157 | { | 157 | { |
158 | return GenerateNoHandlerMessage(); | 158 | return GenerateNoHandlerMessage(); |
159 | } | 159 | } |
160 | 160 | ||
161 | m_log.InfoFormat("[OGP]: path {0}, segments {1} segment[1] {2} Last segment {3}", | 161 | m_log.InfoFormat("[OGP]: path {0}, segments {1} segment[1] {2} Last segment {3}", |
162 | path, pathSegments.Length, pathSegments[1], pathSegments[pathSegments.Length - 1]); | 162 | path, pathSegments.Length, pathSegments[1], pathSegments[pathSegments.Length - 1]); |
163 | 163 | ||
164 | switch (pathSegments[pathSegments.Length - 1]) | 164 | switch (pathSegments[pathSegments.Length - 1]) |
165 | { | 165 | { |
166 | case "rez_avatar": | 166 | case "rez_avatar": |
167 | return RezAvatarMethod(path, request); | 167 | return RezAvatarMethod(path, request); |
168 | //break; | 168 | //break; |
169 | case "derez_avatar": | 169 | case "derez_avatar": |
170 | return DerezAvatarMethod(path, request); | 170 | return DerezAvatarMethod(path, request); |
171 | //break; | 171 | //break; |
172 | 172 | ||
173 | } | 173 | } |
174 | if (path.Length < 2) | 174 | if (path.Length < 2) |
175 | { | 175 | { |
176 | return GenerateNoHandlerMessage(); | 176 | return GenerateNoHandlerMessage(); |
177 | } | 177 | } |
178 | 178 | ||
179 | switch (pathSegments[pathSegments.Length - 2] + "/" + pathSegments[pathSegments.Length - 1]) | 179 | switch (pathSegments[pathSegments.Length - 2] + "/" + pathSegments[pathSegments.Length - 1]) |
180 | { | 180 | { |
181 | case "rez_avatar/rez": | 181 | case "rez_avatar/rez": |
182 | return RezAvatarMethod(path, request); | 182 | return RezAvatarMethod(path, request); |
183 | //break; | 183 | //break; |
184 | case "rez_avatar/request": | 184 | case "rez_avatar/request": |
185 | return RequestRezAvatarMethod(path, request); | 185 | return RequestRezAvatarMethod(path, request); |
186 | //break; | 186 | //break; |
187 | default: | 187 | default: |
188 | return GenerateNoHandlerMessage(); | 188 | return GenerateNoHandlerMessage(); |
189 | } | 189 | } |
190 | //return null; | 190 | //return null; |
191 | } | 191 | } |
192 | 192 | ||
193 | public LLSD RequestRezAvatarMethod(string path, LLSD request) | 193 | public LLSD RequestRezAvatarMethod(string path, LLSD request) |
194 | { | 194 | { |
195 | m_log.WarnFormat("[REQUESTREZAVATAR]: {0}", request.ToString()); | 195 | m_log.WarnFormat("[REQUESTREZAVATAR]: {0}", request.ToString()); |
196 | 196 | ||
197 | LLSDMap requestMap = (LLSDMap)request; | 197 | LLSDMap requestMap = (LLSDMap)request; |
198 | 198 | ||
199 | Scene homeScene = GetRootScene(); | 199 | Scene homeScene = GetRootScene(); |
200 | 200 | ||
201 | 201 | ||
202 | 202 | ||
203 | if (homeScene == null) | 203 | if (homeScene == null) |
204 | return GenerateNoHandlerMessage(); | 204 | return GenerateNoHandlerMessage(); |
205 | 205 | ||
206 | 206 | ||
207 | RegionInfo reg = homeScene.RegionInfo; | 207 | RegionInfo reg = homeScene.RegionInfo; |
208 | ulong regionhandle = GetOSCompatibleRegionHandle(reg); | 208 | ulong regionhandle = GetOSCompatibleRegionHandle(reg); |
209 | string RegionURI = reg.ServerURI; | 209 | string RegionURI = reg.ServerURI; |
210 | int RegionPort = (int)reg.HttpPort; | 210 | int RegionPort = (int)reg.HttpPort; |
211 | 211 | ||
212 | LLUUID RemoteAgentID = requestMap["agent_id"].AsUUID(); | 212 | LLUUID RemoteAgentID = requestMap["agent_id"].AsUUID(); |
213 | 213 | ||
214 | // will be used in the future. The client always connects with the aditi agentid currently | 214 | // will be used in the future. The client always connects with the aditi agentid currently |
215 | LLUUID LocalAgentID = RemoteAgentID; | 215 | LLUUID LocalAgentID = RemoteAgentID; |
216 | 216 | ||
217 | string FirstName = requestMap["first_name"].AsString(); | 217 | string FirstName = requestMap["first_name"].AsString(); |
218 | string LastName = requestMap["last_name"].AsString(); | 218 | string LastName = requestMap["last_name"].AsString(); |
219 | 219 | ||
220 | 220 | ||
221 | OGPState userState = GetOGPState(LocalAgentID); | 221 | OGPState userState = GetOGPState(LocalAgentID); |
222 | 222 | ||
223 | userState.first_name = requestMap["first_name"].AsString(); | 223 | userState.first_name = requestMap["first_name"].AsString(); |
224 | userState.last_name = requestMap["last_name"].AsString(); | 224 | userState.last_name = requestMap["last_name"].AsString(); |
225 | userState.age_verified = requestMap["age_verified"].AsBoolean(); | 225 | userState.age_verified = requestMap["age_verified"].AsBoolean(); |
226 | userState.transacted = requestMap["transacted"].AsBoolean(); | 226 | userState.transacted = requestMap["transacted"].AsBoolean(); |
227 | userState.agent_access = requestMap["agent_access"].AsBoolean(); | 227 | userState.agent_access = requestMap["agent_access"].AsBoolean(); |
228 | userState.allow_redirect = requestMap["allow_redirect"].AsBoolean(); | 228 | userState.allow_redirect = requestMap["allow_redirect"].AsBoolean(); |
229 | userState.identified = requestMap["identified"].AsBoolean(); | 229 | userState.identified = requestMap["identified"].AsBoolean(); |
230 | userState.god_level = (uint)requestMap["god_level"].AsInteger(); | 230 | userState.god_level = (uint)requestMap["god_level"].AsInteger(); |
231 | userState.sim_access = requestMap["sim_access"].AsString(); | 231 | userState.sim_access = requestMap["sim_access"].AsString(); |
232 | userState.agent_id = RemoteAgentID; | 232 | userState.agent_id = RemoteAgentID; |
233 | userState.limited_to_estate = requestMap["limited_to_estate"].AsInteger(); | 233 | userState.limited_to_estate = requestMap["limited_to_estate"].AsInteger(); |
234 | userState.src_can_see_mainland = requestMap["src_can_see_mainland"].AsBoolean(); | 234 | userState.src_can_see_mainland = requestMap["src_can_see_mainland"].AsBoolean(); |
235 | userState.src_estate_id = requestMap["src_estate_id"].AsInteger(); | 235 | userState.src_estate_id = requestMap["src_estate_id"].AsInteger(); |
236 | userState.local_agent_id = LocalAgentID; | 236 | userState.local_agent_id = LocalAgentID; |
237 | 237 | ||
238 | UpdateOGPState(LocalAgentID, userState); | 238 | UpdateOGPState(LocalAgentID, userState); |
239 | 239 | ||
240 | LLSDMap responseMap = new LLSDMap(); | 240 | LLSDMap responseMap = new LLSDMap(); |
241 | responseMap["sim_host"] = LLSD.FromString(Util.GetHostFromDNS(reg.ExternalHostName).ToString()); | 241 | responseMap["sim_host"] = LLSD.FromString(Util.GetHostFromDNS(reg.ExternalHostName).ToString()); |
242 | responseMap["sim_ip"] = LLSD.FromString(Util.GetHostFromDNS(reg.ExternalHostName).ToString()); | 242 | responseMap["sim_ip"] = LLSD.FromString(Util.GetHostFromDNS(reg.ExternalHostName).ToString()); |
243 | responseMap["connect"] = LLSD.FromBoolean(true); | 243 | responseMap["connect"] = LLSD.FromBoolean(true); |
244 | responseMap["sim_port"] = LLSD.FromInteger(reg.InternalEndPoint.Port); | 244 | responseMap["sim_port"] = LLSD.FromInteger(reg.InternalEndPoint.Port); |
245 | responseMap["region_x"] = LLSD.FromInteger(reg.RegionLocX * (uint)Constants.RegionSize); // LLX | 245 | responseMap["region_x"] = LLSD.FromInteger(reg.RegionLocX * (uint)Constants.RegionSize); // LLX |
246 | responseMap["region_Y"] = LLSD.FromInteger(reg.RegionLocY * (uint)Constants.RegionSize); // LLY | 246 | responseMap["region_Y"] = LLSD.FromInteger(reg.RegionLocY * (uint)Constants.RegionSize); // LLY |
247 | responseMap["region_id"] = LLSD.FromUUID(reg.originRegionID); | 247 | responseMap["region_id"] = LLSD.FromUUID(reg.originRegionID); |
248 | responseMap["sim_access"] = LLSD.FromString((reg.RegionSettings.Maturity == 1) ? "Mature" : "PG"); | 248 | responseMap["sim_access"] = LLSD.FromString((reg.RegionSettings.Maturity == 1) ? "Mature" : "PG"); |
249 | 249 | ||
250 | // Generate a dummy agent for the user so we can get back a CAPS path | 250 | // Generate a dummy agent for the user so we can get back a CAPS path |
251 | AgentCircuitData agentData = new AgentCircuitData(); | 251 | AgentCircuitData agentData = new AgentCircuitData(); |
252 | agentData.AgentID = LocalAgentID; | 252 | agentData.AgentID = LocalAgentID; |
253 | agentData.BaseFolder=LLUUID.Zero; | 253 | agentData.BaseFolder=LLUUID.Zero; |
254 | agentData.CapsPath=Util.GetRandomCapsPath(); | 254 | agentData.CapsPath=Util.GetRandomCapsPath(); |
255 | agentData.child = false; | 255 | agentData.child = false; |
256 | agentData.circuitcode = (uint)(Util.RandomClass.Next()); | 256 | agentData.circuitcode = (uint)(Util.RandomClass.Next()); |
257 | agentData.firstname = FirstName; | 257 | agentData.firstname = FirstName; |
258 | agentData.lastname = LastName; | 258 | agentData.lastname = LastName; |
259 | agentData.SecureSessionID=LLUUID.Random(); | 259 | agentData.SecureSessionID=LLUUID.Random(); |
260 | agentData.SessionID=LLUUID.Random(); | 260 | agentData.SessionID=LLUUID.Random(); |
261 | agentData.startpos=LLVector3.Zero; | 261 | agentData.startpos=LLVector3.Zero; |
262 | 262 | ||
263 | // Pre-Fill our region cache with information on the agent. | 263 | // Pre-Fill our region cache with information on the agent. |
264 | UserAgentData useragent = new UserAgentData(); | 264 | UserAgentData useragent = new UserAgentData(); |
265 | useragent.AgentIP="unknown"; | 265 | useragent.AgentIP="unknown"; |
266 | useragent.AgentOnline=true; | 266 | useragent.AgentOnline=true; |
267 | useragent.AgentPort = (uint)0; | 267 | useragent.AgentPort = (uint)0; |
268 | useragent.Handle = regionhandle; | 268 | useragent.Handle = regionhandle; |
269 | useragent.InitialRegion = reg.originRegionID; | 269 | useragent.InitialRegion = reg.originRegionID; |
270 | useragent.LoginTime=Util.UnixTimeSinceEpoch(); | 270 | useragent.LoginTime=Util.UnixTimeSinceEpoch(); |
271 | useragent.LogoutTime = 0; | 271 | useragent.LogoutTime = 0; |
272 | useragent.Position=agentData.startpos; | 272 | useragent.Position=agentData.startpos; |
273 | useragent.PositionX=agentData.startpos.X; | 273 | useragent.PositionX=agentData.startpos.X; |
274 | useragent.PositionY=agentData.startpos.Y; | 274 | useragent.PositionY=agentData.startpos.Y; |
275 | useragent.PositionZ=agentData.startpos.Z; | 275 | useragent.PositionZ=agentData.startpos.Z; |
276 | useragent.Region=reg.originRegionID; | 276 | useragent.Region=reg.originRegionID; |
277 | useragent.SecureSessionID=agentData.SecureSessionID; | 277 | useragent.SecureSessionID=agentData.SecureSessionID; |
278 | useragent.SessionID = agentData.SessionID; | 278 | useragent.SessionID = agentData.SessionID; |
279 | 279 | ||
280 | 280 | ||
281 | UserProfileData userProfile = new UserProfileData(); | 281 | UserProfileData userProfile = new UserProfileData(); |
282 | userProfile.AboutText = "OGP User"; | 282 | userProfile.AboutText = "OGP User"; |
283 | userProfile.CanDoMask = (uint)0; | 283 | userProfile.CanDoMask = (uint)0; |
284 | userProfile.Created = Util.UnixTimeSinceEpoch(); | 284 | userProfile.Created = Util.UnixTimeSinceEpoch(); |
285 | userProfile.CurrentAgent = useragent; | 285 | userProfile.CurrentAgent = useragent; |
286 | userProfile.CustomType = "OGP"; | 286 | userProfile.CustomType = "OGP"; |
287 | userProfile.FirstLifeAboutText = "I'm testing OpenGrid Protocol"; | 287 | userProfile.FirstLifeAboutText = "I'm testing OpenGrid Protocol"; |
288 | userProfile.FirstLifeImage = LLUUID.Zero; | 288 | userProfile.FirstLifeImage = LLUUID.Zero; |
289 | userProfile.FirstName = agentData.firstname; | 289 | userProfile.FirstName = agentData.firstname; |
290 | userProfile.GodLevel = 0; | 290 | userProfile.GodLevel = 0; |
291 | userProfile.HomeLocation = agentData.startpos; | 291 | userProfile.HomeLocation = agentData.startpos; |
292 | userProfile.HomeLocationX = agentData.startpos.X; | 292 | userProfile.HomeLocationX = agentData.startpos.X; |
293 | userProfile.HomeLocationY = agentData.startpos.Y; | 293 | userProfile.HomeLocationY = agentData.startpos.Y; |
294 | userProfile.HomeLocationZ = agentData.startpos.Z; | 294 | userProfile.HomeLocationZ = agentData.startpos.Z; |
295 | userProfile.HomeLookAt = LLVector3.Zero; | 295 | userProfile.HomeLookAt = LLVector3.Zero; |
296 | userProfile.HomeLookAtX = userProfile.HomeLookAt.X; | 296 | userProfile.HomeLookAtX = userProfile.HomeLookAt.X; |
297 | userProfile.HomeLookAtY = userProfile.HomeLookAt.Y; | 297 | userProfile.HomeLookAtY = userProfile.HomeLookAt.Y; |
298 | userProfile.HomeLookAtZ = userProfile.HomeLookAt.Z; | 298 | userProfile.HomeLookAtZ = userProfile.HomeLookAt.Z; |
299 | userProfile.HomeRegion = reg.RegionHandle; | 299 | userProfile.HomeRegion = reg.RegionHandle; |
300 | userProfile.HomeRegionID = reg.originRegionID; | 300 | userProfile.HomeRegionID = reg.originRegionID; |
301 | userProfile.HomeRegionX = reg.RegionLocX; | 301 | userProfile.HomeRegionX = reg.RegionLocX; |
302 | userProfile.HomeRegionY = reg.RegionLocY; | 302 | userProfile.HomeRegionY = reg.RegionLocY; |
303 | userProfile.ID = agentData.AgentID; | 303 | userProfile.ID = agentData.AgentID; |
304 | userProfile.Image = LLUUID.Zero; | 304 | userProfile.Image = LLUUID.Zero; |
305 | userProfile.LastLogin = Util.UnixTimeSinceEpoch(); | 305 | userProfile.LastLogin = Util.UnixTimeSinceEpoch(); |
306 | userProfile.Partner = LLUUID.Zero; | 306 | userProfile.Partner = LLUUID.Zero; |
307 | userProfile.PasswordHash = "$1$"; | 307 | userProfile.PasswordHash = "$1$"; |
308 | userProfile.PasswordSalt = ""; | 308 | userProfile.PasswordSalt = ""; |
309 | userProfile.RootInventoryFolderID = LLUUID.Zero; | 309 | userProfile.RootInventoryFolderID = LLUUID.Zero; |
310 | userProfile.SurName = agentData.lastname; | 310 | userProfile.SurName = agentData.lastname; |
311 | userProfile.UserAssetURI = homeScene.CommsManager.NetworkServersInfo.AssetURL; | 311 | userProfile.UserAssetURI = homeScene.CommsManager.NetworkServersInfo.AssetURL; |
312 | userProfile.UserFlags = 0; | 312 | userProfile.UserFlags = 0; |
313 | userProfile.UserInventoryURI = homeScene.CommsManager.NetworkServersInfo.InventoryURL; | 313 | userProfile.UserInventoryURI = homeScene.CommsManager.NetworkServersInfo.InventoryURL; |
314 | userProfile.WantDoMask = 0; | 314 | userProfile.WantDoMask = 0; |
315 | userProfile.WebLoginKey = LLUUID.Random(); | 315 | userProfile.WebLoginKey = LLUUID.Random(); |
316 | 316 | ||
317 | // Do caps registration | 317 | // Do caps registration |
318 | // get seed cap | 318 | // get seed cap |
319 | 319 | ||
320 | 320 | ||
321 | // Stick our data in the cache so the region will know something about us | 321 | // Stick our data in the cache so the region will know something about us |
322 | homeScene.CommsManager.UserProfileCacheService.PreloadUserCache(agentData.AgentID, userProfile); | 322 | homeScene.CommsManager.UserProfileCacheService.PreloadUserCache(agentData.AgentID, userProfile); |
323 | 323 | ||
324 | // Call 'new user' event handler | 324 | // Call 'new user' event handler |
325 | homeScene.NewUserConnection(reg.RegionHandle, agentData); | 325 | homeScene.NewUserConnection(reg.RegionHandle, agentData); |
326 | 326 | ||
327 | 327 | ||
328 | string raCap = string.Empty; | 328 | string raCap = string.Empty; |
329 | 329 | ||
330 | LLUUID AvatarRezCapUUID = LLUUID.Random(); | 330 | LLUUID AvatarRezCapUUID = LLUUID.Random(); |
331 | string rezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar"; | 331 | string rezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar"; |
332 | 332 | ||
333 | // Get a reference to the user's cap so we can pull out the Caps Object Path | 333 | // Get a reference to the user's cap so we can pull out the Caps Object Path |
334 | OpenSim.Framework.Communications.Capabilities.Caps userCap = homeScene.GetCapsHandlerForUser(agentData.AgentID); | 334 | OpenSim.Framework.Communications.Capabilities.Caps userCap = homeScene.GetCapsHandlerForUser(agentData.AgentID); |
335 | 335 | ||
336 | responseMap["seed_capability"] = LLSD.FromString("http://" + reg.ExternalHostName + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/"); | 336 | responseMap["seed_capability"] = LLSD.FromString("http://" + reg.ExternalHostName + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/"); |
337 | 337 | ||
338 | responseMap["rez_avatar/rez"] = LLSD.FromString("http://" + reg.ExternalHostName + ":" + reg.HttpPort + rezAvatarPath); | 338 | responseMap["rez_avatar/rez"] = LLSD.FromString("http://" + reg.ExternalHostName + ":" + reg.HttpPort + rezAvatarPath); |
339 | 339 | ||
340 | // Add the user to the list of CAPS that are outstanding. | 340 | // Add the user to the list of CAPS that are outstanding. |
341 | // well allow the caps hosts in this dictionary | 341 | // well allow the caps hosts in this dictionary |
342 | lock (CapsLoginID) | 342 | lock (CapsLoginID) |
343 | { | 343 | { |
344 | if (CapsLoginID.ContainsKey(rezAvatarPath)) | 344 | if (CapsLoginID.ContainsKey(rezAvatarPath)) |
345 | { | 345 | { |
346 | m_log.Error("[OGP]: Holy anomoly batman! Caps path already existed! All the UUID Duplication worries were founded!"); | 346 | m_log.Error("[OGP]: Holy anomoly batman! Caps path already existed! All the UUID Duplication worries were founded!"); |
347 | } | 347 | } |
348 | else | 348 | else |
349 | { | 349 | { |
350 | CapsLoginID.Add(rezAvatarPath, agentData); | 350 | CapsLoginID.Add(rezAvatarPath, agentData); |
351 | } | 351 | } |
352 | } | 352 | } |
353 | 353 | ||
354 | return responseMap; | 354 | return responseMap; |
355 | } | 355 | } |
356 | 356 | ||
357 | public LLSD RezAvatarMethod(string path, LLSD request) | 357 | public LLSD RezAvatarMethod(string path, LLSD request) |
358 | { | 358 | { |
359 | m_log.WarnFormat("[REZAVATAR]: {0}", request.ToString()); | 359 | m_log.WarnFormat("[REZAVATAR]: {0}", request.ToString()); |
360 | 360 | ||
361 | LLSDMap responseMap = new LLSDMap(); | 361 | LLSDMap responseMap = new LLSDMap(); |
362 | 362 | ||
363 | AgentCircuitData userData = null; | 363 | AgentCircuitData userData = null; |
364 | 364 | ||
365 | // Only people we've issued a cap can go further | 365 | // Only people we've issued a cap can go further |
366 | if (TryGetAgentCircuitData(path,out userData)) | 366 | if (TryGetAgentCircuitData(path,out userData)) |
367 | { | 367 | { |
368 | LLSDMap requestMap = (LLSDMap)request; | 368 | LLSDMap requestMap = (LLSDMap)request; |
369 | 369 | ||
370 | // take these values to start. There's a few more | 370 | // take these values to start. There's a few more |
371 | LLUUID SecureSessionID=requestMap["secure_session_id"].AsUUID(); | 371 | LLUUID SecureSessionID=requestMap["secure_session_id"].AsUUID(); |
372 | LLUUID SessionID = requestMap["session_id"].AsUUID(); | 372 | LLUUID SessionID = requestMap["session_id"].AsUUID(); |
373 | int circuitcode = requestMap["circuit_code"].AsInteger(); | 373 | int circuitcode = requestMap["circuit_code"].AsInteger(); |
374 | 374 | ||
375 | //Update our Circuit data with the real values | 375 | //Update our Circuit data with the real values |
376 | userData.SecureSessionID = SecureSessionID; | 376 | userData.SecureSessionID = SecureSessionID; |
377 | userData.SessionID = SessionID; | 377 | userData.SessionID = SessionID; |
378 | 378 | ||
379 | // Locate a home scene suitable for the user. | 379 | // Locate a home scene suitable for the user. |
380 | Scene homeScene = GetRootScene(); | 380 | Scene homeScene = GetRootScene(); |
381 | 381 | ||
382 | if (homeScene != null) | 382 | if (homeScene != null) |
383 | { | 383 | { |
384 | // Get a reference to their Cap object so we can pull out the capobjectroot | 384 | // Get a reference to their Cap object so we can pull out the capobjectroot |
385 | OpenSim.Framework.Communications.Capabilities.Caps userCap = | 385 | OpenSim.Framework.Communications.Capabilities.Caps userCap = |
386 | homeScene.GetCapsHandlerForUser(userData.AgentID); | 386 | homeScene.GetCapsHandlerForUser(userData.AgentID); |
387 | 387 | ||
388 | //Update the circuit data in the region so this user is authorized | 388 | //Update the circuit data in the region so this user is authorized |
389 | homeScene.UpdateCircuitData(userData); | 389 | homeScene.UpdateCircuitData(userData); |
390 | homeScene.ChangeCircuitCode(userData.circuitcode,(uint)circuitcode); | 390 | homeScene.ChangeCircuitCode(userData.circuitcode,(uint)circuitcode); |
391 | 391 | ||
392 | // Load state | 392 | // Load state |
393 | OGPState userState = GetOGPState(userData.AgentID); | 393 | OGPState userState = GetOGPState(userData.AgentID); |
394 | 394 | ||
395 | // Keep state changes | 395 | // Keep state changes |
396 | userState.first_name = requestMap["first_name"].AsString(); | 396 | userState.first_name = requestMap["first_name"].AsString(); |
397 | userState.secure_session_id = requestMap["secure_session_id"].AsUUID(); | 397 | userState.secure_session_id = requestMap["secure_session_id"].AsUUID(); |
398 | userState.age_verified = requestMap["age_verified"].AsBoolean(); | 398 | userState.age_verified = requestMap["age_verified"].AsBoolean(); |
399 | userState.region_id = homeScene.RegionInfo.originRegionID; // replace 0000000 with our regionid | 399 | userState.region_id = homeScene.RegionInfo.originRegionID; // replace 0000000 with our regionid |
400 | userState.transacted = requestMap["transacted"].AsBoolean(); | 400 | userState.transacted = requestMap["transacted"].AsBoolean(); |
401 | userState.agent_access = requestMap["agent_access"].AsBoolean(); | 401 | userState.agent_access = requestMap["agent_access"].AsBoolean(); |
402 | userState.inventory_host = requestMap["inventory_host"].AsString(); | 402 | userState.inventory_host = requestMap["inventory_host"].AsString(); |
403 | userState.identified = requestMap["identified"].AsBoolean(); | 403 | userState.identified = requestMap["identified"].AsBoolean(); |
404 | userState.session_id = requestMap["session_id"].AsUUID(); | 404 | userState.session_id = requestMap["session_id"].AsUUID(); |
405 | userState.god_level = (uint)requestMap["god_level"].AsInteger(); | 405 | userState.god_level = (uint)requestMap["god_level"].AsInteger(); |
406 | userState.last_name = requestMap["last_name"].AsString(); | 406 | userState.last_name = requestMap["last_name"].AsString(); |
407 | userState.god_overide = requestMap["god_override"].AsBoolean(); | 407 | userState.god_overide = requestMap["god_override"].AsBoolean(); |
408 | userState.circuit_code = (uint)requestMap["circuit_code"].AsInteger(); | 408 | userState.circuit_code = (uint)requestMap["circuit_code"].AsInteger(); |
409 | userState.limited_to_estate = requestMap["limited_to_estate"].AsInteger(); | 409 | userState.limited_to_estate = requestMap["limited_to_estate"].AsInteger(); |
410 | 410 | ||
411 | // Save state changes | 411 | // Save state changes |
412 | UpdateOGPState(userData.AgentID, userState); | 412 | UpdateOGPState(userData.AgentID, userState); |
413 | 413 | ||
414 | // Get the region information for the home region. | 414 | // Get the region information for the home region. |
415 | RegionInfo reg = homeScene.RegionInfo; | 415 | RegionInfo reg = homeScene.RegionInfo; |
416 | 416 | ||
417 | // Dummy positional and look at info.. we don't have it. | 417 | // Dummy positional and look at info.. we don't have it. |
418 | LLSDArray PositionArray = new LLSDArray(); | 418 | LLSDArray PositionArray = new LLSDArray(); |
419 | PositionArray.Add(LLSD.FromInteger(128)); | 419 | PositionArray.Add(LLSD.FromInteger(128)); |
420 | PositionArray.Add(LLSD.FromInteger(128)); | 420 | PositionArray.Add(LLSD.FromInteger(128)); |
421 | PositionArray.Add(LLSD.FromInteger(40)); | 421 | PositionArray.Add(LLSD.FromInteger(40)); |
422 | 422 | ||
423 | LLSDArray LookAtArray = new LLSDArray(); | 423 | LLSDArray LookAtArray = new LLSDArray(); |
424 | LookAtArray.Add(LLSD.FromInteger(1)); | 424 | LookAtArray.Add(LLSD.FromInteger(1)); |
425 | LookAtArray.Add(LLSD.FromInteger(1)); | 425 | LookAtArray.Add(LLSD.FromInteger(1)); |
426 | LookAtArray.Add(LLSD.FromInteger(1)); | 426 | LookAtArray.Add(LLSD.FromInteger(1)); |
427 | 427 | ||
428 | // Our region's X and Y position in OpenSimulator space. | 428 | // Our region's X and Y position in OpenSimulator space. |
429 | uint fooX = reg.RegionLocX; | 429 | uint fooX = reg.RegionLocX; |
430 | uint fooY = reg.RegionLocY; | 430 | uint fooY = reg.RegionLocY; |
431 | m_log.InfoFormat("[OGP]: region x({0}) region y({1})", fooX, fooY); | 431 | m_log.InfoFormat("[OGP]: region x({0}) region y({1})", fooX, fooY); |
432 | m_log.InfoFormat("[OGP]: region http {0} {1}", reg.ServerURI, reg.HttpPort); | 432 | m_log.InfoFormat("[OGP]: region http {0} {1}", reg.ServerURI, reg.HttpPort); |
433 | m_log.InfoFormat("[OGO]: region UUID {0} ", reg.RegionID); | 433 | m_log.InfoFormat("[OGO]: region UUID {0} ", reg.RegionID); |
434 | 434 | ||
435 | // Convert the X and Y position to LL space | 435 | // Convert the X and Y position to LL space |
436 | responseMap["region_x"] = LLSD.FromInteger(fooX * (uint)Constants.RegionSize); // convert it to LL X | 436 | responseMap["region_x"] = LLSD.FromInteger(fooX * (uint)Constants.RegionSize); // convert it to LL X |
437 | responseMap["region_y"] = LLSD.FromInteger(fooY * (uint)Constants.RegionSize); // convert it to LL Y | 437 | responseMap["region_y"] = LLSD.FromInteger(fooY * (uint)Constants.RegionSize); // convert it to LL Y |
438 | 438 | ||
439 | // Give em a new seed capability | 439 | // Give em a new seed capability |
440 | responseMap["seed_capability"] = LLSD.FromString("http://" + reg.ExternalHostName + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/"); | 440 | responseMap["seed_capability"] = LLSD.FromString("http://" + reg.ExternalHostName + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/"); |
441 | responseMap["region"] = LLSD.FromUUID(reg.originRegionID); | 441 | responseMap["region"] = LLSD.FromUUID(reg.originRegionID); |
442 | responseMap["look_at"] = LookAtArray; | 442 | responseMap["look_at"] = LookAtArray; |
443 | 443 | ||
444 | responseMap["sim_port"] = LLSD.FromInteger(reg.InternalEndPoint.Port); | 444 | responseMap["sim_port"] = LLSD.FromInteger(reg.InternalEndPoint.Port); |
445 | responseMap["sim_host"] = LLSD.FromString(Util.GetHostFromDNS(reg.ExternalHostName).ToString());// + ":" + reg.InternalEndPoint.Port.ToString()); | 445 | responseMap["sim_host"] = LLSD.FromString(Util.GetHostFromDNS(reg.ExternalHostName).ToString());// + ":" + reg.InternalEndPoint.Port.ToString()); |
446 | responseMap["sim_ip"] = LLSD.FromString(Util.GetHostFromDNS(reg.ExternalHostName).ToString()); | 446 | responseMap["sim_ip"] = LLSD.FromString(Util.GetHostFromDNS(reg.ExternalHostName).ToString()); |
447 | 447 | ||
448 | responseMap["session_id"] = LLSD.FromUUID(SessionID); | 448 | responseMap["session_id"] = LLSD.FromUUID(SessionID); |
449 | responseMap["secure_session_id"] = LLSD.FromUUID(SecureSessionID); | 449 | responseMap["secure_session_id"] = LLSD.FromUUID(SecureSessionID); |
450 | responseMap["circuit_code"] = LLSD.FromInteger(circuitcode); | 450 | responseMap["circuit_code"] = LLSD.FromInteger(circuitcode); |
451 | 451 | ||
452 | responseMap["position"] = PositionArray; | 452 | responseMap["position"] = PositionArray; |
453 | 453 | ||
454 | responseMap["region_id"] = LLSD.FromUUID(reg.originRegionID); | 454 | responseMap["region_id"] = LLSD.FromUUID(reg.originRegionID); |
455 | 455 | ||
456 | responseMap["sim_access"] = LLSD.FromString("Mature"); | 456 | responseMap["sim_access"] = LLSD.FromString("Mature"); |
457 | 457 | ||
458 | responseMap["connect"] = LLSD.FromBoolean(true); | 458 | responseMap["connect"] = LLSD.FromBoolean(true); |
459 | 459 | ||
460 | m_log.InfoFormat("[OGP]: host: {0}, IP {1}", responseMap["sim_host"].ToString(), responseMap["sim_ip"].ToString()); | 460 | m_log.InfoFormat("[OGP]: host: {0}, IP {1}", responseMap["sim_host"].ToString(), responseMap["sim_ip"].ToString()); |
461 | 461 | ||
462 | } | 462 | } |
463 | 463 | ||
464 | } | 464 | } |
465 | 465 | ||
466 | return responseMap; | 466 | return responseMap; |
467 | } | 467 | } |
468 | 468 | ||
469 | 469 | ||
470 | 470 | ||
471 | public LLSD DerezAvatarMethod(string path, LLSD request) | 471 | public LLSD DerezAvatarMethod(string path, LLSD request) |
472 | { | 472 | { |
473 | 473 | ||
474 | 474 | ||
475 | m_log.ErrorFormat("DerezPath: {0}, Request: {1}", path, request.ToString()); | 475 | m_log.ErrorFormat("DerezPath: {0}, Request: {1}", path, request.ToString()); |
476 | 476 | ||
477 | LLSD llsdResponse = null; | 477 | LLSD llsdResponse = null; |
478 | LLSDMap responseMap = new LLSDMap(); | 478 | LLSDMap responseMap = new LLSDMap(); |
479 | 479 | ||
480 | 480 | ||
481 | 481 | ||
482 | string[] PathArray = path.Split('/'); | 482 | string[] PathArray = path.Split('/'); |
483 | m_log.InfoFormat("[OGP]: prefix {0}, uuid {1}, suffix {2}", PathArray[1], PathArray[2], PathArray[3]); | 483 | m_log.InfoFormat("[OGP]: prefix {0}, uuid {1}, suffix {2}", PathArray[1], PathArray[2], PathArray[3]); |
484 | string uuidString = PathArray[2]; | 484 | string uuidString = PathArray[2]; |
485 | m_log.InfoFormat("[OGP]: Request to Derez avatar with UUID {0}", uuidString); | 485 | m_log.InfoFormat("[OGP]: Request to Derez avatar with UUID {0}", uuidString); |
486 | LLUUID userUUID = LLUUID.Zero; | 486 | LLUUID userUUID = LLUUID.Zero; |
487 | if (Helpers.TryParse(uuidString, out userUUID)) | 487 | if (Helpers.TryParse(uuidString, out userUUID)) |
488 | { | 488 | { |
489 | 489 | ||
490 | LLUUID RemoteID = uuidString; | 490 | LLUUID RemoteID = uuidString; |
491 | LLUUID LocalID = RemoteID; | 491 | LLUUID LocalID = RemoteID; |
492 | // FIXME: TODO: Routine to map RemoteUUIDs to LocalUUIds | 492 | // FIXME: TODO: Routine to map RemoteUUIDs to LocalUUIds |
493 | // would be done already.. but the client connects with the Aditi UUID | 493 | // would be done already.. but the client connects with the Aditi UUID |
494 | // regardless over the UDP stack | 494 | // regardless over the UDP stack |
495 | 495 | ||
496 | OGPState userState = GetOGPState(LocalID); | 496 | OGPState userState = GetOGPState(LocalID); |
497 | if (userState.agent_id != LLUUID.Zero) | 497 | if (userState.agent_id != LLUUID.Zero) |
498 | { | 498 | { |
499 | 499 | ||
500 | LLSDMap outboundRequestMap = new LLSDMap(); | 500 | LLSDMap outboundRequestMap = new LLSDMap(); |
501 | LLSDMap inboundRequestMap = (LLSDMap)request; | 501 | LLSDMap inboundRequestMap = (LLSDMap)request; |
502 | string rezAvatarString = inboundRequestMap["rez_avatar"].AsString(); | 502 | string rezAvatarString = inboundRequestMap["rez_avatar"].AsString(); |
503 | 503 | ||
504 | LLSDArray LookAtArray = new LLSDArray(); | 504 | LLSDArray LookAtArray = new LLSDArray(); |
505 | LookAtArray.Add(LLSD.FromInteger(1)); | 505 | LookAtArray.Add(LLSD.FromInteger(1)); |
506 | LookAtArray.Add(LLSD.FromInteger(1)); | 506 | LookAtArray.Add(LLSD.FromInteger(1)); |
507 | LookAtArray.Add(LLSD.FromInteger(1)); | 507 | LookAtArray.Add(LLSD.FromInteger(1)); |
508 | 508 | ||
509 | 509 | ||
510 | LLSDArray PositionArray = new LLSDArray(); | 510 | LLSDArray PositionArray = new LLSDArray(); |
511 | PositionArray.Add(LLSD.FromInteger(128)); | 511 | PositionArray.Add(LLSD.FromInteger(128)); |
512 | PositionArray.Add(LLSD.FromInteger(128)); | 512 | PositionArray.Add(LLSD.FromInteger(128)); |
513 | PositionArray.Add(LLSD.FromInteger(40)); | 513 | PositionArray.Add(LLSD.FromInteger(40)); |
514 | 514 | ||
515 | LLSDArray lookArray = new LLSDArray(); | 515 | LLSDArray lookArray = new LLSDArray(); |
516 | lookArray.Add(LLSD.FromInteger(128)); | 516 | lookArray.Add(LLSD.FromInteger(128)); |
517 | lookArray.Add(LLSD.FromInteger(128)); | 517 | lookArray.Add(LLSD.FromInteger(128)); |
518 | lookArray.Add(LLSD.FromInteger(40)); | 518 | lookArray.Add(LLSD.FromInteger(40)); |
519 | 519 | ||
520 | responseMap["connect"] = LLSD.FromBoolean(true);// it's okay to give this user up | 520 | responseMap["connect"] = LLSD.FromBoolean(true);// it's okay to give this user up |
521 | responseMap["look_at"] = LookAtArray; | 521 | responseMap["look_at"] = LookAtArray; |
522 | 522 | ||
523 | m_log.WarnFormat("[OGP]: Invoking rez_avatar on host:{0} for avatar: {1} {2}", rezAvatarString, userState.first_name, userState.last_name); | 523 | m_log.WarnFormat("[OGP]: Invoking rez_avatar on host:{0} for avatar: {1} {2}", rezAvatarString, userState.first_name, userState.last_name); |
524 | 524 | ||
525 | LLSDMap rezResponseMap = invokeRezAvatarCap(responseMap, rezAvatarString,userState); | 525 | LLSDMap rezResponseMap = invokeRezAvatarCap(responseMap, rezAvatarString,userState); |
526 | 526 | ||
527 | // If invoking it returned an error, parse and end | 527 | // If invoking it returned an error, parse and end |
528 | if (rezResponseMap.ContainsKey("connect")) | 528 | if (rezResponseMap.ContainsKey("connect")) |
529 | { | 529 | { |
530 | if (rezResponseMap["connect"].AsBoolean() == false) | 530 | if (rezResponseMap["connect"].AsBoolean() == false) |
531 | { | 531 | { |
532 | return responseMap; | 532 | return responseMap; |
533 | } | 533 | } |
534 | } | 534 | } |
535 | 535 | ||
536 | string rezRespSeedCap = rezResponseMap["seed_capability"].AsString(); | 536 | string rezRespSeedCap = rezResponseMap["seed_capability"].AsString(); |
537 | string rezRespSim_ip = rezResponseMap["sim_ip"].AsString(); | 537 | string rezRespSim_ip = rezResponseMap["sim_ip"].AsString(); |
538 | string rezRespSim_host = rezResponseMap["sim_host"].AsString(); | 538 | string rezRespSim_host = rezResponseMap["sim_host"].AsString(); |
539 | 539 | ||
540 | int rrPort = rezResponseMap["sim_port"].AsInteger(); | 540 | int rrPort = rezResponseMap["sim_port"].AsInteger(); |
541 | int rrX = rezResponseMap["region_x"].AsInteger(); | 541 | int rrX = rezResponseMap["region_x"].AsInteger(); |
542 | int rrY = rezResponseMap["region_y"].AsInteger(); | 542 | int rrY = rezResponseMap["region_y"].AsInteger(); |
543 | m_log.ErrorFormat("X:{0}, Y:{1}", rrX, rrY); | 543 | m_log.ErrorFormat("X:{0}, Y:{1}", rrX, rrY); |
544 | LLUUID rrRID = rezResponseMap["region_id"].AsUUID(); | 544 | LLUUID rrRID = rezResponseMap["region_id"].AsUUID(); |
545 | 545 | ||
546 | string rrAccess = rezResponseMap["sim_access"].AsString(); | 546 | string rrAccess = rezResponseMap["sim_access"].AsString(); |
547 | 547 | ||
548 | LLSDArray RezResponsePositionArray = (LLSDArray)rezResponseMap["position"]; | 548 | LLSDArray RezResponsePositionArray = (LLSDArray)rezResponseMap["position"]; |
549 | 549 | ||
550 | responseMap["seed_capability"] = LLSD.FromString(rezRespSeedCap); | 550 | responseMap["seed_capability"] = LLSD.FromString(rezRespSeedCap); |
551 | responseMap["sim_ip"] = LLSD.FromString(Util.GetHostFromDNS(rezRespSim_ip).ToString()); | 551 | responseMap["sim_ip"] = LLSD.FromString(Util.GetHostFromDNS(rezRespSim_ip).ToString()); |
552 | responseMap["sim_host"] = LLSD.FromString(Util.GetHostFromDNS(rezRespSim_host).ToString()); | 552 | responseMap["sim_host"] = LLSD.FromString(Util.GetHostFromDNS(rezRespSim_host).ToString()); |
553 | responseMap["sim_port"] = LLSD.FromInteger(rrPort); | 553 | responseMap["sim_port"] = LLSD.FromInteger(rrPort); |
554 | responseMap["region_x"] = LLSD.FromInteger(rrX ); | 554 | responseMap["region_x"] = LLSD.FromInteger(rrX ); |
555 | responseMap["region_y"] = LLSD.FromInteger(rrY ); | 555 | responseMap["region_y"] = LLSD.FromInteger(rrY ); |
556 | responseMap["region_id"] = LLSD.FromUUID(rrRID); | 556 | responseMap["region_id"] = LLSD.FromUUID(rrRID); |
557 | responseMap["sim_access"] = LLSD.FromString(rrAccess); | 557 | responseMap["sim_access"] = LLSD.FromString(rrAccess); |
558 | 558 | ||
559 | 559 | ||
560 | 560 | ||
561 | responseMap["position"] = RezResponsePositionArray; | 561 | responseMap["position"] = RezResponsePositionArray; |
562 | responseMap["look_at"] = lookArray; | 562 | responseMap["look_at"] = lookArray; |
563 | responseMap["connect"] = LLSD.FromBoolean(true); | 563 | responseMap["connect"] = LLSD.FromBoolean(true); |
564 | 564 | ||
565 | ShutdownConnection(LocalID,this); | 565 | ShutdownConnection(LocalID,this); |
566 | 566 | ||
567 | 567 | ||
568 | m_log.Warn("RESPONSEDEREZ: " + responseMap.ToString()); | 568 | m_log.Warn("RESPONSEDEREZ: " + responseMap.ToString()); |
569 | return responseMap; | 569 | return responseMap; |
570 | 570 | ||
571 | } | 571 | } |
572 | else | 572 | else |
573 | { | 573 | { |
574 | 574 | ||
575 | return GenerateNoHandlerMessage(); | 575 | return GenerateNoHandlerMessage(); |
576 | } | 576 | } |
577 | } | 577 | } |
578 | else | 578 | else |
579 | { | 579 | { |
580 | return GenerateNoHandlerMessage(); | 580 | return GenerateNoHandlerMessage(); |
581 | } | 581 | } |
582 | 582 | ||
583 | return responseMap; | 583 | return responseMap; |
584 | } | 584 | } |
585 | 585 | ||
586 | private LLSDMap invokeRezAvatarCap(LLSDMap responseMap, string CapAddress, OGPState userState) | 586 | private LLSDMap invokeRezAvatarCap(LLSDMap responseMap, string CapAddress, OGPState userState) |
587 | { | 587 | { |
588 | 588 | ||
589 | WebRequest DeRezRequest = WebRequest.Create(CapAddress); | 589 | WebRequest DeRezRequest = WebRequest.Create(CapAddress); |
590 | DeRezRequest.Method = "POST"; | 590 | DeRezRequest.Method = "POST"; |
591 | DeRezRequest.ContentType = "application/xml+llsd"; | 591 | DeRezRequest.ContentType = "application/xml+llsd"; |
592 | 592 | ||
593 | LLSDMap RAMap = new LLSDMap(); | 593 | LLSDMap RAMap = new LLSDMap(); |
594 | LLSDMap AgentParms = new LLSDMap(); | 594 | LLSDMap AgentParms = new LLSDMap(); |
595 | LLSDMap RegionParms = new LLSDMap(); | 595 | LLSDMap RegionParms = new LLSDMap(); |
596 | 596 | ||
597 | 597 | ||
598 | AgentParms["first_name"] = LLSD.FromString(userState.first_name); | 598 | AgentParms["first_name"] = LLSD.FromString(userState.first_name); |
599 | AgentParms["last_name"] = LLSD.FromString(userState.last_name); | 599 | AgentParms["last_name"] = LLSD.FromString(userState.last_name); |
600 | AgentParms["agent_id"] = LLSD.FromUUID(userState.agent_id); | 600 | AgentParms["agent_id"] = LLSD.FromUUID(userState.agent_id); |
601 | RegionParms["region_id"] = LLSD.FromUUID(userState.region_id); | 601 | RegionParms["region_id"] = LLSD.FromUUID(userState.region_id); |
602 | AgentParms["circuit_code"] = LLSD.FromInteger(userState.circuit_code); | 602 | AgentParms["circuit_code"] = LLSD.FromInteger(userState.circuit_code); |
603 | AgentParms["secure_session_id"] = LLSD.FromUUID(userState.secure_session_id); | 603 | AgentParms["secure_session_id"] = LLSD.FromUUID(userState.secure_session_id); |
604 | AgentParms["session_id"] = LLSD.FromUUID(userState.session_id); | 604 | AgentParms["session_id"] = LLSD.FromUUID(userState.session_id); |
605 | AgentParms["agent_access"] = LLSD.FromBoolean(userState.agent_access); | 605 | AgentParms["agent_access"] = LLSD.FromBoolean(userState.agent_access); |
606 | AgentParms["god_level"] = LLSD.FromInteger(userState.god_level); | 606 | AgentParms["god_level"] = LLSD.FromInteger(userState.god_level); |
607 | AgentParms["god_overide"] = LLSD.FromBoolean(userState.god_overide); | 607 | AgentParms["god_overide"] = LLSD.FromBoolean(userState.god_overide); |
608 | AgentParms["identified"] = LLSD.FromBoolean(userState.identified); | 608 | AgentParms["identified"] = LLSD.FromBoolean(userState.identified); |
609 | AgentParms["transacted"] = LLSD.FromBoolean(userState.transacted); | 609 | AgentParms["transacted"] = LLSD.FromBoolean(userState.transacted); |
610 | AgentParms["age_verified"] = LLSD.FromBoolean(userState.age_verified); | 610 | AgentParms["age_verified"] = LLSD.FromBoolean(userState.age_verified); |
611 | AgentParms["limited_to_estate"] = LLSD.FromInteger(userState.limited_to_estate); | 611 | AgentParms["limited_to_estate"] = LLSD.FromInteger(userState.limited_to_estate); |
612 | AgentParms["inventory_host"] = LLSD.FromString(userState.inventory_host); | 612 | AgentParms["inventory_host"] = LLSD.FromString(userState.inventory_host); |
613 | RAMap["agent_params"] = AgentParms; | 613 | RAMap["agent_params"] = AgentParms; |
614 | RAMap["region_params"] = RegionParms; | 614 | RAMap["region_params"] = RegionParms; |
615 | 615 | ||
616 | string RAMapString = AgentParms.ToString(); | 616 | string RAMapString = AgentParms.ToString(); |
617 | m_log.InfoFormat("[OGP] RAMap string {0}", RAMapString); | 617 | m_log.InfoFormat("[OGP] RAMap string {0}", RAMapString); |
618 | LLSD LLSDofRAMap = AgentParms; // RENAME if this works | 618 | LLSD LLSDofRAMap = AgentParms; // RENAME if this works |
619 | 619 | ||
620 | m_log.InfoFormat("[OGP]: LLSD of map as string was {0}", LLSDofRAMap.ToString()); | 620 | m_log.InfoFormat("[OGP]: LLSD of map as string was {0}", LLSDofRAMap.ToString()); |
621 | byte[] buffer = LLSDParser.SerializeXmlBytes(LLSDofRAMap); | 621 | byte[] buffer = LLSDParser.SerializeXmlBytes(LLSDofRAMap); |
622 | 622 | ||
623 | //string bufferDump = System.Text.Encoding.ASCII.GetString(buffer); | 623 | //string bufferDump = System.Text.Encoding.ASCII.GetString(buffer); |
624 | //m_log.InfoFormat("[OGP]: buffer form is {0}",bufferDump); | 624 | //m_log.InfoFormat("[OGP]: buffer form is {0}",bufferDump); |
625 | //m_log.InfoFormat("[OGP]: LLSD of map was {0}",buffer.Length); | 625 | //m_log.InfoFormat("[OGP]: LLSD of map was {0}",buffer.Length); |
626 | 626 | ||
627 | Stream os = null; | 627 | Stream os = null; |
628 | try | 628 | try |
629 | { // send the Post | 629 | { // send the Post |
630 | DeRezRequest.ContentLength = buffer.Length; //Count bytes to send | 630 | DeRezRequest.ContentLength = buffer.Length; //Count bytes to send |
631 | os = DeRezRequest.GetRequestStream(); | 631 | os = DeRezRequest.GetRequestStream(); |
632 | os.Write(buffer, 0, buffer.Length); //Send it | 632 | os.Write(buffer, 0, buffer.Length); //Send it |
633 | os.Close(); | 633 | os.Close(); |
634 | m_log.InfoFormat("[OGP]: Derez Avatar Posted Rez Avatar request to remote sim {0}", CapAddress); | 634 | m_log.InfoFormat("[OGP]: Derez Avatar Posted Rez Avatar request to remote sim {0}", CapAddress); |
635 | } | 635 | } |
636 | catch (WebException ex) | 636 | catch (WebException ex) |
637 | { | 637 | { |
638 | m_log.InfoFormat("[OGP] Bad send on de_rez_avatar {0}", ex.Message); | 638 | m_log.InfoFormat("[OGP] Bad send on de_rez_avatar {0}", ex.Message); |
639 | responseMap["connect"] = LLSD.FromBoolean(false); | 639 | responseMap["connect"] = LLSD.FromBoolean(false); |
640 | 640 | ||
641 | return responseMap; | 641 | return responseMap; |
642 | } | 642 | } |
643 | 643 | ||
644 | m_log.Info("[OGP] waiting for a reply after rez avatar send"); | 644 | m_log.Info("[OGP] waiting for a reply after rez avatar send"); |
645 | string rez_avatar_reply = null; | 645 | string rez_avatar_reply = null; |
646 | { // get the response | 646 | { // get the response |
647 | try | 647 | try |
648 | { | 648 | { |
649 | WebResponse webResponse = DeRezRequest.GetResponse(); | 649 | WebResponse webResponse = DeRezRequest.GetResponse(); |
650 | if (webResponse == null) | 650 | if (webResponse == null) |
651 | { | 651 | { |
652 | m_log.Info("[OGP:] Null reply on rez_avatar post"); | 652 | m_log.Info("[OGP:] Null reply on rez_avatar post"); |
653 | } | 653 | } |
654 | 654 | ||
655 | StreamReader sr = new StreamReader(webResponse.GetResponseStream()); | 655 | StreamReader sr = new StreamReader(webResponse.GetResponseStream()); |
656 | rez_avatar_reply = sr.ReadToEnd().Trim(); | 656 | rez_avatar_reply = sr.ReadToEnd().Trim(); |
657 | m_log.InfoFormat("[OGP]: rez_avatar reply was {0} ", rez_avatar_reply); | 657 | m_log.InfoFormat("[OGP]: rez_avatar reply was {0} ", rez_avatar_reply); |
658 | 658 | ||
659 | } | 659 | } |
660 | catch (WebException ex) | 660 | catch (WebException ex) |
661 | { | 661 | { |
662 | m_log.InfoFormat("[OGP]: exception on read after send of rez avatar {0}", ex.Message); | 662 | m_log.InfoFormat("[OGP]: exception on read after send of rez avatar {0}", ex.Message); |
663 | responseMap["connect"] = LLSD.FromBoolean(false); | 663 | responseMap["connect"] = LLSD.FromBoolean(false); |
664 | 664 | ||
665 | return responseMap; | 665 | return responseMap; |
666 | } | 666 | } |
667 | LLSD rezResponse = null; | 667 | LLSD rezResponse = null; |
668 | try | 668 | try |
669 | { | 669 | { |
670 | rezResponse = LLSDParser.DeserializeXml(rez_avatar_reply); | 670 | rezResponse = LLSDParser.DeserializeXml(rez_avatar_reply); |
671 | 671 | ||
672 | responseMap = (LLSDMap)rezResponse; | 672 | responseMap = (LLSDMap)rezResponse; |
673 | } | 673 | } |
674 | catch (Exception ex) | 674 | catch (Exception ex) |
675 | { | 675 | { |
676 | m_log.InfoFormat("[OGP]: exception on parse of rez reply {0}", ex.Message); | 676 | m_log.InfoFormat("[OGP]: exception on parse of rez reply {0}", ex.Message); |
677 | responseMap["connect"] = LLSD.FromBoolean(false); | 677 | responseMap["connect"] = LLSD.FromBoolean(false); |
678 | 678 | ||
679 | return responseMap; | 679 | return responseMap; |
680 | } | 680 | } |
681 | } | 681 | } |
682 | return responseMap; | 682 | return responseMap; |
683 | } | 683 | } |
684 | 684 | ||
685 | 685 | ||
686 | 686 | ||
687 | public LLSD GenerateNoHandlerMessage() | 687 | public LLSD GenerateNoHandlerMessage() |
688 | { | 688 | { |
689 | LLSDMap map = new LLSDMap(); | 689 | LLSDMap map = new LLSDMap(); |
690 | map["reason"] = LLSD.FromString("LLSDRequest"); | 690 | map["reason"] = LLSD.FromString("LLSDRequest"); |
691 | map["message"] = LLSD.FromString("No handler registered for LLSD Requests"); | 691 | map["message"] = LLSD.FromString("No handler registered for LLSD Requests"); |
692 | map["login"] = LLSD.FromString("false"); | 692 | map["login"] = LLSD.FromString("false"); |
693 | 693 | ||
694 | return map; | 694 | return map; |
695 | } | 695 | } |
696 | 696 | ||
697 | private bool TryGetAgentCircuitData(string path, out AgentCircuitData userdata) | 697 | private bool TryGetAgentCircuitData(string path, out AgentCircuitData userdata) |
698 | { | 698 | { |
699 | userdata = null; | 699 | userdata = null; |
700 | lock (CapsLoginID) | 700 | lock (CapsLoginID) |
701 | { | 701 | { |
702 | if (CapsLoginID.ContainsKey(path)) | 702 | if (CapsLoginID.ContainsKey(path)) |
703 | { | 703 | { |
704 | userdata = CapsLoginID[path]; | 704 | userdata = CapsLoginID[path]; |
705 | DiscardUsedCap(path); | 705 | DiscardUsedCap(path); |
706 | return true; | 706 | return true; |
707 | } | 707 | } |
708 | } | 708 | } |
709 | return false; | 709 | return false; |
710 | } | 710 | } |
711 | 711 | ||
712 | private void DiscardUsedCap(string path) | 712 | private void DiscardUsedCap(string path) |
713 | { | 713 | { |
714 | CapsLoginID.Remove(path); | 714 | CapsLoginID.Remove(path); |
715 | } | 715 | } |
716 | 716 | ||
717 | 717 | ||
718 | private Scene GetRootScene() | 718 | private Scene GetRootScene() |
719 | { | 719 | { |
720 | Scene ReturnScene = null; | 720 | Scene ReturnScene = null; |
721 | lock (m_scene) | 721 | lock (m_scene) |
722 | { | 722 | { |
723 | if (m_scene.Count > 0) | 723 | if (m_scene.Count > 0) |
724 | { | 724 | { |
725 | ReturnScene = m_scene[0]; | 725 | ReturnScene = m_scene[0]; |
726 | } | 726 | } |
727 | } | 727 | } |
728 | 728 | ||
729 | return ReturnScene; | 729 | return ReturnScene; |
730 | 730 | ||
731 | } | 731 | } |
732 | 732 | ||
733 | private ulong GetOSCompatibleRegionHandle(RegionInfo reg) | 733 | private ulong GetOSCompatibleRegionHandle(RegionInfo reg) |
734 | { | 734 | { |
735 | return Util.UIntsToLong(reg.RegionLocX, reg.RegionLocY); | 735 | return Util.UIntsToLong(reg.RegionLocX, reg.RegionLocY); |
736 | } | 736 | } |
737 | 737 | ||
738 | private ulong GetOSCompatibleRegionHandle(uint x, uint y) | 738 | private ulong GetOSCompatibleRegionHandle(uint x, uint y) |
739 | { | 739 | { |
740 | return Util.UIntsToLong(x, y); | 740 | return Util.UIntsToLong(x, y); |
741 | } | 741 | } |
742 | 742 | ||
743 | private ulong GetOSCompatibleRegionHandle(ulong regionhandle) | 743 | private ulong GetOSCompatibleRegionHandle(ulong regionhandle) |
744 | { | 744 | { |
745 | uint x,y; | 745 | uint x,y; |
746 | Helpers.LongToUInts(regionhandle,out x, out y); | 746 | Helpers.LongToUInts(regionhandle,out x, out y); |
747 | return GetOSCompatibleRegionHandle(x,y); | 747 | return GetOSCompatibleRegionHandle(x,y); |
748 | } | 748 | } |
749 | 749 | ||
750 | 750 | ||
751 | private ulong GetOGPCompatibleRegionHandle(RegionInfo reg) | 751 | private ulong GetOGPCompatibleRegionHandle(RegionInfo reg) |
752 | { | 752 | { |
753 | return Util.UIntsToLong((reg.RegionLocX * (uint)Constants.RegionSize), (reg.RegionLocY * (uint)Constants.RegionSize)); | 753 | return Util.UIntsToLong((reg.RegionLocX * (uint)Constants.RegionSize), (reg.RegionLocY * (uint)Constants.RegionSize)); |
754 | } | 754 | } |
755 | 755 | ||
756 | private ulong GetOGPCompatibleRegionHandle(uint x, uint y) | 756 | private ulong GetOGPCompatibleRegionHandle(uint x, uint y) |
757 | { | 757 | { |
758 | return Util.UIntsToLong((x * (uint)Constants.RegionSize), (y * (uint)Constants.RegionSize)); | 758 | return Util.UIntsToLong((x * (uint)Constants.RegionSize), (y * (uint)Constants.RegionSize)); |
759 | } | 759 | } |
760 | 760 | ||
761 | private ulong GetOGPCompatibleRegionHandle(ulong regionhandle) | 761 | private ulong GetOGPCompatibleRegionHandle(ulong regionhandle) |
762 | { | 762 | { |
763 | uint x, y; | 763 | uint x, y; |
764 | Helpers.LongToUInts(regionhandle, out x, out y); | 764 | Helpers.LongToUInts(regionhandle, out x, out y); |
765 | return GetOGPCompatibleRegionHandle(x, y); | 765 | return GetOGPCompatibleRegionHandle(x, y); |
766 | } | 766 | } |
767 | 767 | ||
768 | private OGPState InitializeNewState() | 768 | private OGPState InitializeNewState() |
769 | { | 769 | { |
770 | OGPState returnState = new OGPState(); | 770 | OGPState returnState = new OGPState(); |
771 | returnState.first_name = ""; | 771 | returnState.first_name = ""; |
772 | returnState.last_name = ""; | 772 | returnState.last_name = ""; |
773 | returnState.agent_id = LLUUID.Zero; | 773 | returnState.agent_id = LLUUID.Zero; |
774 | returnState.local_agent_id = LLUUID.Zero; | 774 | returnState.local_agent_id = LLUUID.Zero; |
775 | returnState.region_id = LLUUID.Zero; | 775 | returnState.region_id = LLUUID.Zero; |
776 | returnState.circuit_code = 0; | 776 | returnState.circuit_code = 0; |
777 | returnState.secure_session_id = LLUUID.Zero; | 777 | returnState.secure_session_id = LLUUID.Zero; |
778 | returnState.session_id = LLUUID.Zero; | 778 | returnState.session_id = LLUUID.Zero; |
779 | returnState.agent_access = true; | 779 | returnState.agent_access = true; |
780 | returnState.god_level = 0; | 780 | returnState.god_level = 0; |
781 | returnState.god_overide = false; | 781 | returnState.god_overide = false; |
782 | returnState.identified = false; | 782 | returnState.identified = false; |
783 | returnState.transacted = false; | 783 | returnState.transacted = false; |
784 | returnState.age_verified = false; | 784 | returnState.age_verified = false; |
785 | returnState.limited_to_estate = 1; | 785 | returnState.limited_to_estate = 1; |
786 | returnState.inventory_host = "http://inv4.mysql.aditi.lindenlab.com"; | 786 | returnState.inventory_host = "http://inv4.mysql.aditi.lindenlab.com"; |
787 | returnState.allow_redirect = true; | 787 | returnState.allow_redirect = true; |
788 | returnState.sim_access = ""; | 788 | returnState.sim_access = ""; |
789 | returnState.src_can_see_mainland = true; | 789 | returnState.src_can_see_mainland = true; |
790 | returnState.src_estate_id = 1; | 790 | returnState.src_estate_id = 1; |
791 | 791 | ||
792 | return returnState; | 792 | return returnState; |
793 | } | 793 | } |
794 | 794 | ||
795 | private OGPState GetOGPState(LLUUID agentId) | 795 | private OGPState GetOGPState(LLUUID agentId) |
796 | { | 796 | { |
797 | lock (m_OGPState) | 797 | lock (m_OGPState) |
798 | { | 798 | { |
799 | if (m_OGPState.ContainsKey(agentId)) | 799 | if (m_OGPState.ContainsKey(agentId)) |
800 | { | 800 | { |
801 | return m_OGPState[agentId]; | 801 | return m_OGPState[agentId]; |
802 | } | 802 | } |
803 | else | 803 | else |
804 | { | 804 | { |
805 | return InitializeNewState(); | 805 | return InitializeNewState(); |
806 | } | 806 | } |
807 | } | 807 | } |
808 | } | 808 | } |
809 | 809 | ||
810 | public void DeleteOGPState(LLUUID agentId) | 810 | public void DeleteOGPState(LLUUID agentId) |
811 | { | 811 | { |
812 | lock (m_OGPState) | 812 | lock (m_OGPState) |
813 | if (m_OGPState.ContainsKey(agentId)) | 813 | if (m_OGPState.ContainsKey(agentId)) |
814 | m_OGPState.Remove(agentId); | 814 | m_OGPState.Remove(agentId); |
815 | 815 | ||
816 | } | 816 | } |
817 | 817 | ||
818 | private void UpdateOGPState(LLUUID agentId, OGPState state) | 818 | private void UpdateOGPState(LLUUID agentId, OGPState state) |
819 | { | 819 | { |
820 | lock (m_OGPState) | 820 | lock (m_OGPState) |
821 | { | 821 | { |
822 | if (m_OGPState.ContainsKey(agentId)) | 822 | if (m_OGPState.ContainsKey(agentId)) |
823 | { | 823 | { |
824 | m_OGPState[agentId] = state; | 824 | m_OGPState[agentId] = state; |
825 | } | 825 | } |
826 | else | 826 | else |
827 | { | 827 | { |
828 | m_OGPState.Add(agentId,state); | 828 | m_OGPState.Add(agentId,state); |
829 | } | 829 | } |
830 | } | 830 | } |
831 | } | 831 | } |
832 | public void ShutdownConnection(LLUUID avatarId, OpenGridProtocolModule mod) | 832 | public void ShutdownConnection(LLUUID avatarId, OpenGridProtocolModule mod) |
833 | { | 833 | { |
834 | Scene homeScene = GetRootScene(); | 834 | Scene homeScene = GetRootScene(); |
835 | ScenePresence avatar = null; | 835 | ScenePresence avatar = null; |
836 | if (homeScene.TryGetAvatar(avatarId,out avatar)) | 836 | if (homeScene.TryGetAvatar(avatarId,out avatar)) |
837 | { | 837 | { |
838 | KillAUser ku = new KillAUser(avatar,mod); | 838 | KillAUser ku = new KillAUser(avatar,mod); |
839 | Thread ta = new Thread(ku.ShutdownNoLogout); | 839 | Thread ta = new Thread(ku.ShutdownNoLogout); |
840 | ta.IsBackground = true; | 840 | ta.IsBackground = true; |
841 | ta.Name = "ShutdownThread"; | 841 | ta.Name = "ShutdownThread"; |
842 | ta.Start(); | 842 | ta.Start(); |
843 | } | 843 | } |
844 | } | 844 | } |
845 | } | 845 | } |
846 | 846 | ||
847 | public class KillAUser | 847 | public class KillAUser |
848 | { | 848 | { |
849 | private ScenePresence avToBeKilled = null; | 849 | private ScenePresence avToBeKilled = null; |
850 | private OpenGridProtocolModule m_mod = null; | 850 | private OpenGridProtocolModule m_mod = null; |
851 | 851 | ||
852 | public KillAUser(ScenePresence avatar, OpenGridProtocolModule mod) | 852 | public KillAUser(ScenePresence avatar, OpenGridProtocolModule mod) |
853 | { | 853 | { |
854 | avToBeKilled = avatar; | 854 | avToBeKilled = avatar; |
855 | m_mod = mod; | 855 | m_mod = mod; |
856 | } | 856 | } |
857 | 857 | ||
858 | public void ShutdownNoLogout() | 858 | public void ShutdownNoLogout() |
859 | { | 859 | { |
860 | LLUUID avUUID = LLUUID.Zero; | 860 | LLUUID avUUID = LLUUID.Zero; |
861 | 861 | ||
862 | if (avToBeKilled != null) | 862 | if (avToBeKilled != null) |
863 | { | 863 | { |
864 | avUUID = avToBeKilled.UUID; | 864 | avUUID = avToBeKilled.UUID; |
865 | avToBeKilled.MakeChildAgent(); | 865 | avToBeKilled.MakeChildAgent(); |
866 | 866 | ||
867 | avToBeKilled.ControllingClient.SendLogoutPacketWhenClosing = false; | 867 | avToBeKilled.ControllingClient.SendLogoutPacketWhenClosing = false; |
868 | 868 | ||
869 | Thread.Sleep(30000); | 869 | Thread.Sleep(30000); |
870 | 870 | ||
871 | // test for child agent because they might have come back | 871 | // test for child agent because they might have come back |
872 | if (avToBeKilled.IsChildAgent) | 872 | if (avToBeKilled.IsChildAgent) |
873 | { | 873 | { |
874 | m_mod.DeleteOGPState(avUUID); | 874 | m_mod.DeleteOGPState(avUUID); |
875 | avToBeKilled.ControllingClient.Close(true); | 875 | avToBeKilled.ControllingClient.Close(true); |
876 | } | 876 | } |
877 | } | 877 | } |
878 | } | 878 | } |
879 | 879 | ||
880 | } | 880 | } |
881 | } | 881 | } |