diff options
Diffstat (limited to 'OpenSim/Server/Handlers/Hypergrid')
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs | 45 |
1 files changed, 4 insertions, 41 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs index 138313a..74b7422 100644 --- a/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs | |||
@@ -125,7 +125,6 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
125 | UUID.TryParse((string)requestData["to_agent_id"], out toAgentID); | 125 | UUID.TryParse((string)requestData["to_agent_id"], out toAgentID); |
126 | UUID.TryParse((string)requestData["im_session_id"], out imSessionID); | 126 | UUID.TryParse((string)requestData["im_session_id"], out imSessionID); |
127 | UUID.TryParse((string)requestData["region_id"], out RegionID); | 127 | UUID.TryParse((string)requestData["region_id"], out RegionID); |
128 | |||
129 | try | 128 | try |
130 | { | 129 | { |
131 | timestamp = (uint)Convert.ToInt32((string)requestData["timestamp"]); | 130 | timestamp = (uint)Convert.ToInt32((string)requestData["timestamp"]); |
@@ -185,45 +184,9 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
185 | { | 184 | { |
186 | } | 185 | } |
187 | 186 | ||
188 | try | 187 | float.TryParse((string)requestData["position_x"], out pos_x); |
189 | { | 188 | float.TryParse((string)requestData["position_y"], out pos_y); |
190 | pos_x = (uint)Convert.ToInt32((string)requestData["position_x"]); | 189 | float.TryParse((string)requestData["position_z"], out pos_z); |
191 | } | ||
192 | catch (ArgumentException) | ||
193 | { | ||
194 | } | ||
195 | catch (FormatException) | ||
196 | { | ||
197 | } | ||
198 | catch (OverflowException) | ||
199 | { | ||
200 | } | ||
201 | try | ||
202 | { | ||
203 | pos_y = (uint)Convert.ToInt32((string)requestData["position_y"]); | ||
204 | } | ||
205 | catch (ArgumentException) | ||
206 | { | ||
207 | } | ||
208 | catch (FormatException) | ||
209 | { | ||
210 | } | ||
211 | catch (OverflowException) | ||
212 | { | ||
213 | } | ||
214 | try | ||
215 | { | ||
216 | pos_z = (uint)Convert.ToInt32((string)requestData["position_z"]); | ||
217 | } | ||
218 | catch (ArgumentException) | ||
219 | { | ||
220 | } | ||
221 | catch (FormatException) | ||
222 | { | ||
223 | } | ||
224 | catch (OverflowException) | ||
225 | { | ||
226 | } | ||
227 | 190 | ||
228 | Position = new Vector3(pos_x, pos_y, pos_z); | 191 | Position = new Vector3(pos_x, pos_y, pos_z); |
229 | 192 | ||
@@ -243,7 +206,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
243 | gim.fromAgentName = fromAgentName; | 206 | gim.fromAgentName = fromAgentName; |
244 | gim.fromGroup = fromGroup; | 207 | gim.fromGroup = fromGroup; |
245 | gim.imSessionID = imSessionID.Guid; | 208 | gim.imSessionID = imSessionID.Guid; |
246 | gim.RegionID = UUID.Zero.Guid; // RegionID.Guid; | 209 | gim.RegionID = RegionID.Guid; |
247 | gim.timestamp = timestamp; | 210 | gim.timestamp = timestamp; |
248 | gim.toAgentID = toAgentID.Guid; | 211 | gim.toAgentID = toAgentID.Guid; |
249 | gim.message = message; | 212 | gim.message = message; |