diff options
author | lbsa71 | 2009-02-12 09:53:12 +0000 |
---|---|---|
committer | lbsa71 | 2009-02-12 09:53:12 +0000 |
commit | 801da4346aeb3c08969c4845f5c595135a64470a (patch) | |
tree | 2f06e24c72e0d513c8e4c6aa9b75cd2c7b50f393 /OpenSim/Region/CoreModules/InterGrid | |
parent | Thanks Kitto Flora for a patch that adds automatic min fly height to ODE - Ma... (diff) | |
download | opensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.zip opensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.tar.gz opensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.tar.bz2 opensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.tar.xz |
* optimized usings.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | 57 |
1 files changed, 26 insertions, 31 deletions
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs index 2e1675b..42a76bd 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | |||
@@ -25,32 +25,27 @@ | |||
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 System; | 28 | using System; |
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.Security.Cryptography.X509Certificates; | 33 | using System.Reflection; |
34 | using System.Reflection; | 34 | using System.Security.Cryptography.X509Certificates; |
35 | using System.Threading; | 35 | using System.Threading; |
36 | using System.Web; | 36 | using System.Web; |
37 | 37 | using log4net; | |
38 | using OpenMetaverse; | 38 | using Nini.Config; |
39 | using OpenMetaverse.StructuredData; | 39 | using OpenMetaverse; |
40 | using OpenMetaverse.Packets; | 40 | using OpenMetaverse.StructuredData; |
41 | 41 | using OpenSim.Framework; | |
42 | using log4net; | 42 | using OpenSim.Framework.Communications.Capabilities; |
43 | using Nini.Config; | 43 | using OpenSim.Region.Framework.Interfaces; |
44 | using OpenSim.Framework; | 44 | using OpenSim.Region.Framework.Scenes; |
45 | using OpenSim.Framework.Communications.Capabilities; | 45 | using Caps=OpenSim.Framework.Communications.Capabilities.Caps; |
46 | using OpenSim.Framework.Servers; | 46 | using OSDArray=OpenMetaverse.StructuredData.OSDArray; |
47 | using OpenSim.Region.Framework.Interfaces; | 47 | using OSDMap=OpenMetaverse.StructuredData.OSDMap; |
48 | using OpenSim.Region.Framework.Scenes; | 48 | |
49 | |||
50 | using OSD = OpenMetaverse.StructuredData.OSD; | ||
51 | using OSDMap = OpenMetaverse.StructuredData.OSDMap; | ||
52 | using OSDArray = OpenMetaverse.StructuredData.OSDArray; | ||
53 | |||
54 | namespace OpenSim.Region.CoreModules.InterGrid | 49 | namespace OpenSim.Region.CoreModules.InterGrid |
55 | { | 50 | { |
56 | public struct OGPState | 51 | public struct OGPState |
@@ -360,7 +355,7 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
360 | 355 | ||
361 | // Using OpenSim.Framework.Communications.Capabilities.Caps here one time.. | 356 | // Using OpenSim.Framework.Communications.Capabilities.Caps here one time.. |
362 | // so the long name is probably better then a using statement | 357 | // so the long name is probably better then a using statement |
363 | public void OnRegisterCaps(UUID agentID, OpenSim.Framework.Communications.Capabilities.Caps caps) | 358 | public void OnRegisterCaps(UUID agentID, Caps caps) |
364 | { | 359 | { |
365 | /* If we ever want to register our own caps here.... | 360 | /* If we ever want to register our own caps here.... |
366 | * | 361 | * |
@@ -558,7 +553,7 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
558 | string rezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar/rez"; | 553 | string rezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar/rez"; |
559 | string derezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar/derez"; | 554 | string derezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar/derez"; |
560 | // Get a reference to the user's cap so we can pull out the Caps Object Path | 555 | // Get a reference to the user's cap so we can pull out the Caps Object Path |
561 | OpenSim.Framework.Communications.Capabilities.Caps userCap | 556 | Caps userCap |
562 | = homeScene.CapsModule.GetCapsHandlerForUser(agentData.AgentID); | 557 | = homeScene.CapsModule.GetCapsHandlerForUser(agentData.AgentID); |
563 | 558 | ||
564 | string rezHttpProtocol = "http://"; | 559 | string rezHttpProtocol = "http://"; |
@@ -683,7 +678,7 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
683 | if (homeScene != null) | 678 | if (homeScene != null) |
684 | { | 679 | { |
685 | // Get a referenceokay - to their Cap object so we can pull out the capobjectroot | 680 | // Get a referenceokay - to their Cap object so we can pull out the capobjectroot |
686 | OpenSim.Framework.Communications.Capabilities.Caps userCap | 681 | Caps userCap |
687 | = homeScene.CapsModule.GetCapsHandlerForUser(userData.AgentID); | 682 | = homeScene.CapsModule.GetCapsHandlerForUser(userData.AgentID); |
688 | 683 | ||
689 | //Update the circuit data in the region so this user is authorized | 684 | //Update the circuit data in the region so this user is authorized |
@@ -889,7 +884,7 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
889 | 884 | ||
890 | ShutdownConnection(LocalID,this); | 885 | ShutdownConnection(LocalID,this); |
891 | // PLEASE STOP CHANGING THIS TO an M_LOG, M_LOG DOESN'T WORK ON MULTILINE .TOSTRINGS | 886 | // PLEASE STOP CHANGING THIS TO an M_LOG, M_LOG DOESN'T WORK ON MULTILINE .TOSTRINGS |
892 | System.Console.WriteLine("RESPONSEDEREZ: " + responseMap.ToString()); | 887 | Console.WriteLine("RESPONSEDEREZ: " + responseMap.ToString()); |
893 | return responseMap; | 888 | return responseMap; |
894 | } | 889 | } |
895 | else | 890 | else |
@@ -1202,7 +1197,7 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
1202 | 1197 | ||
1203 | private string CreateRandomStr(int len) | 1198 | private string CreateRandomStr(int len) |
1204 | { | 1199 | { |
1205 | Random rnd = new Random(System.Environment.TickCount); | 1200 | Random rnd = new Random(Environment.TickCount); |
1206 | string returnstring = ""; | 1201 | string returnstring = ""; |
1207 | string chars = "abcdefghijklmnopqrstuvwxyz0123456789"; | 1202 | string chars = "abcdefghijklmnopqrstuvwxyz0123456789"; |
1208 | 1203 | ||