diff options
author | Jeff Ames | 2008-06-04 09:59:27 +0000 |
---|---|---|
committer | Jeff Ames | 2008-06-04 09:59:27 +0000 |
commit | 4ec4e16c809cf86a63b736d2b7b6ad7291595a5f (patch) | |
tree | cfa896ef9057228171e2ee39c4807060101ba90b /OpenSim/Region/Environment/Modules/Avatar/InstantMessage | |
parent | * If a ThreadAbortException reaches AuthUser() then let it pass through unmol... (diff) | |
download | opensim-SC_OLD-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.zip opensim-SC_OLD-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.gz opensim-SC_OLD-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.bz2 opensim-SC_OLD-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.xz |
Formatting cleanup, minor refactoring, svn properties.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Avatar/InstantMessage')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs index 36184d2..b22ca79 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | |||
50 | #region IRegionModule Members | 50 | #region IRegionModule Members |
51 | 51 | ||
52 | private bool gridmode = false; | 52 | private bool gridmode = false; |
53 | 53 | ||
54 | 54 | ||
55 | public void Initialise(Scene scene, IConfigSource config) | 55 | public void Initialise(Scene scene, IConfigSource config) |
56 | { | 56 | { |
@@ -183,13 +183,13 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | |||
183 | } | 183 | } |
184 | } | 184 | } |
185 | 185 | ||
186 | 186 | ||
187 | } | 187 | } |
188 | 188 | ||
189 | // Trusty OSG1 called method. This method also gets called from the FriendsModule | 189 | // Trusty OSG1 called method. This method also gets called from the FriendsModule |
190 | // Turns out the sim has to send an instant message to the user to get it to show an accepted friend. | 190 | // Turns out the sim has to send an instant message to the user to get it to show an accepted friend. |
191 | /// <summary> | 191 | /// <summary> |
192 | /// | 192 | /// |
193 | /// </summary> | 193 | /// </summary> |
194 | /// <param name="msg"></param> | 194 | /// <param name="msg"></param> |
195 | private void OnGridInstantMessage(GridInstantMessage msg) | 195 | private void OnGridInstantMessage(GridInstantMessage msg) |
@@ -207,7 +207,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | |||
207 | /// Process a XMLRPC Grid Instant Message | 207 | /// Process a XMLRPC Grid Instant Message |
208 | /// </summary> | 208 | /// </summary> |
209 | /// <param name="request">XMLRPC parameters from_agent_id from_agent_session to_agent_id im_session_id timestamp | 209 | /// <param name="request">XMLRPC parameters from_agent_id from_agent_session to_agent_id im_session_id timestamp |
210 | /// from_agent_name message dialog from_group offline parent_estate_id position_x position_y position_z region_id | 210 | /// from_agent_name message dialog from_group offline parent_estate_id position_x position_y position_z region_id |
211 | /// binary_bucket region_handle</param> | 211 | /// binary_bucket region_handle</param> |
212 | /// <returns>Nothing much</returns> | 212 | /// <returns>Nothing much</returns> |
213 | protected virtual XmlRpcResponse processXMLRPCGridInstantMessage(XmlRpcRequest request) | 213 | protected virtual XmlRpcResponse processXMLRPCGridInstantMessage(XmlRpcRequest request) |
@@ -221,7 +221,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | |||
221 | uint timestamp = 0; | 221 | uint timestamp = 0; |
222 | string fromAgentName = ""; | 222 | string fromAgentName = ""; |
223 | string message = ""; | 223 | string message = ""; |
224 | byte dialog = (byte)0; | 224 | byte dialog = (byte)0; |
225 | bool fromGroup = false; | 225 | bool fromGroup = false; |
226 | byte offline = (byte)0; | 226 | byte offline = (byte)0; |
227 | uint ParentEstateID=0; | 227 | uint ParentEstateID=0; |
@@ -237,14 +237,14 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | |||
237 | 237 | ||
238 | Hashtable requestData = (Hashtable)request.Params[0]; | 238 | Hashtable requestData = (Hashtable)request.Params[0]; |
239 | // Check if it's got all the data | 239 | // Check if it's got all the data |
240 | if (requestData.ContainsKey("from_agent_id") && requestData.ContainsKey("from_agent_session") | 240 | if (requestData.ContainsKey("from_agent_id") && requestData.ContainsKey("from_agent_session") |
241 | && requestData.ContainsKey("to_agent_id") && requestData.ContainsKey("im_session_id") | 241 | && requestData.ContainsKey("to_agent_id") && requestData.ContainsKey("im_session_id") |
242 | && requestData.ContainsKey("timestamp") && requestData.ContainsKey("from_agent_name") | 242 | && requestData.ContainsKey("timestamp") && requestData.ContainsKey("from_agent_name") |
243 | && requestData.ContainsKey("message") && requestData.ContainsKey("dialog") | 243 | && requestData.ContainsKey("message") && requestData.ContainsKey("dialog") |
244 | && requestData.ContainsKey("from_group") | 244 | && requestData.ContainsKey("from_group") |
245 | && requestData.ContainsKey("offline") && requestData.ContainsKey("parent_estate_id") | 245 | && requestData.ContainsKey("offline") && requestData.ContainsKey("parent_estate_id") |
246 | && requestData.ContainsKey("position_x") && requestData.ContainsKey("position_y") | 246 | && requestData.ContainsKey("position_x") && requestData.ContainsKey("position_y") |
247 | && requestData.ContainsKey("position_z") && requestData.ContainsKey("region_id") | 247 | && requestData.ContainsKey("position_z") && requestData.ContainsKey("region_id") |
248 | && requestData.ContainsKey("binary_bucket") && requestData.ContainsKey("region_handle")) | 248 | && requestData.ContainsKey("binary_bucket") && requestData.ContainsKey("region_handle")) |
249 | { | 249 | { |
250 | // Do the easy way of validating the UUIDs | 250 | // Do the easy way of validating the UUIDs |
@@ -276,7 +276,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | |||
276 | // Bytes don't transfer well over XMLRPC, so, we Base64 Encode them. | 276 | // Bytes don't transfer well over XMLRPC, so, we Base64 Encode them. |
277 | byte[] dialogdata = Convert.FromBase64String((string)requestData["dialog"]); | 277 | byte[] dialogdata = Convert.FromBase64String((string)requestData["dialog"]); |
278 | dialog = dialogdata[0]; | 278 | dialog = dialogdata[0]; |
279 | 279 | ||
280 | if ((string)requestData["from_group"] == "TRUE") | 280 | if ((string)requestData["from_group"] == "TRUE") |
281 | fromGroup = true; | 281 | fromGroup = true; |
282 | 282 | ||
@@ -365,7 +365,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | |||
365 | gim.Position = new sLLVector3(Position); | 365 | gim.Position = new sLLVector3(Position); |
366 | gim.binaryBucket = binaryBucket; | 366 | gim.binaryBucket = binaryBucket; |
367 | 367 | ||
368 | 368 | ||
369 | // Trigger the Instant message in the scene. | 369 | // Trigger the Instant message in the scene. |
370 | foreach (Scene scene in m_scenes) | 370 | foreach (Scene scene in m_scenes) |
371 | { | 371 | { |
@@ -381,7 +381,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | |||
381 | } | 381 | } |
382 | } | 382 | } |
383 | //OnGridInstantMessage(gim); | 383 | //OnGridInstantMessage(gim); |
384 | 384 | ||
385 | } | 385 | } |
386 | 386 | ||
387 | //Send response back to region calling if it was successful | 387 | //Send response back to region calling if it was successful |
@@ -482,7 +482,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | |||
482 | else | 482 | else |
483 | { | 483 | { |
484 | lookupAgent = true; | 484 | lookupAgent = true; |
485 | 485 | ||
486 | 486 | ||
487 | } | 487 | } |
488 | } | 488 | } |
@@ -564,7 +564,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | |||
564 | else | 564 | else |
565 | { | 565 | { |
566 | // try again, but lookup user this time. | 566 | // try again, but lookup user this time. |
567 | // Warning, this must call the Async version | 567 | // Warning, this must call the Async version |
568 | // of this method or we'll be making thousands of threads | 568 | // of this method or we'll be making thousands of threads |
569 | // The version within the spawned thread is SendGridInstantMessageViaXMLRPCAsync | 569 | // The version within the spawned thread is SendGridInstantMessageViaXMLRPCAsync |
570 | // The version that spawns the thread is SendGridInstantMessageViaXMLRPC | 570 | // The version that spawns the thread is SendGridInstantMessageViaXMLRPC |
@@ -686,7 +686,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | |||
686 | 686 | ||
687 | if (msg.fromGroup) | 687 | if (msg.fromGroup) |
688 | gim["from_group"] = "TRUE"; | 688 | gim["from_group"] = "TRUE"; |
689 | else | 689 | else |
690 | gim["from_group"] = "FALSE"; | 690 | gim["from_group"] = "FALSE"; |
691 | byte[] offlinedata = new byte[1]; offlinedata[0] = msg.offline; | 691 | byte[] offlinedata = new byte[1]; offlinedata[0] = msg.offline; |
692 | gim["offline"] = Convert.ToBase64String(offlinedata, Base64FormattingOptions.None); | 692 | gim["offline"] = Convert.ToBase64String(offlinedata, Base64FormattingOptions.None); |