aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs
diff options
context:
space:
mode:
authorAdam Frisby2008-04-21 07:09:17 +0000
committerAdam Frisby2008-04-21 07:09:17 +0000
commitfef3b3689492dea63693c964bcdbec9f5137eb5e (patch)
tree7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs
parent* Terrain Module code has been reformatted to comply with guidelines. (diff)
downloadopensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs32
1 files changed, 17 insertions, 15 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs b/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs
index 4567e60..013ae0f 100644
--- a/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs
+++ b/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs
@@ -28,7 +28,9 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Diagnostics; 30using System.Diagnostics;
31using System.Net;
31using System.Text; 32using System.Text;
33using System.Web;
32using libsecondlife; 34using libsecondlife;
33using OpenSim.Region.ScriptEngine.Common.TRPC; 35using OpenSim.Region.ScriptEngine.Common.TRPC;
34 36
@@ -41,24 +43,24 @@ namespace OpenSim.Region.ScriptEngine.Common
41 43
42 public delegate void ReceiveCommandDelegate(int ID, string Command, params object[] p); 44 public delegate void ReceiveCommandDelegate(int ID, string Command, params object[] p);
43 public event ReceiveCommandDelegate ReceiveCommand; 45 public event ReceiveCommandDelegate ReceiveCommand;
44 System.Collections.Generic.Dictionary<string, Type> TypeDictionary = new Dictionary<string, Type>(); 46 Dictionary<string, Type> TypeDictionary = new Dictionary<string, Type>();
45 Type[] Types = 47 Type[] Types =
46 { 48 {
47 typeof(System.String), 49 typeof(String),
48 typeof(System.Int16), 50 typeof(Int16),
49 typeof(System.Int32), 51 typeof(Int32),
50 typeof(System.Int64), 52 typeof(Int64),
51 typeof(System.Double), 53 typeof(Double),
52 typeof(System.Decimal), 54 typeof(Decimal),
53 typeof(System.Array), 55 typeof(Array),
54 typeof(LLUUID), 56 typeof(LLUUID),
55 typeof(System.UInt16), 57 typeof(UInt16),
56 typeof(System.UInt32), 58 typeof(UInt32),
57 typeof(System.UInt64) 59 typeof(UInt64)
58 }; 60 };
59 61
60 // TODO: Maybe we should move queue into TCPSocket so we won't have to keep one queue instance per connection 62 // TODO: Maybe we should move queue into TCPSocket so we won't have to keep one queue instance per connection
61 private System.Collections.Generic.Dictionary<int, InQueueStruct> InQueue = new Dictionary<int, InQueueStruct>(); 63 private Dictionary<int, InQueueStruct> InQueue = new Dictionary<int, InQueueStruct>();
62 private class InQueueStruct 64 private class InQueueStruct
63 { 65 {
64 public byte[] Queue; 66 public byte[] Queue;
@@ -81,7 +83,7 @@ namespace OpenSim.Region.ScriptEngine.Common
81 } 83 }
82 } 84 }
83 85
84 void TCPS_ClientConnected(int ID, System.Net.EndPoint Remote) 86 void TCPS_ClientConnected(int ID, EndPoint Remote)
85 { 87 {
86 // Create a incoming queue for this connection 88 // Create a incoming queue for this connection
87 InQueueStruct iq = new InQueueStruct(); 89 InQueueStruct iq = new InQueueStruct();
@@ -165,7 +167,7 @@ namespace OpenSim.Region.ScriptEngine.Common
165 for (int i = 1; i < parts.Length; i++) 167 for (int i = 1; i < parts.Length; i++)
166 { 168 {
167 string[] spl; 169 string[] spl;
168 spl = System.Web.HttpUtility.UrlDecode(parts[i]).Split('|'); 170 spl = HttpUtility.UrlDecode(parts[i]).Split('|');
169 string t = spl[0]; 171 string t = spl[0];
170 param[i - 1] = Convert.ChangeType(spl[1], TypeLookup(t)); 172 param[i - 1] = Convert.ChangeType(spl[1], TypeLookup(t));
171 } 173 }
@@ -192,7 +194,7 @@ namespace OpenSim.Region.ScriptEngine.Common
192 string tmpStr = Command; 194 string tmpStr = Command;
193 for (int i = 0; i < p.Length; i++) 195 for (int i = 0; i < p.Length; i++)
194 { 196 {
195 tmpStr += "," + p[i].GetType().ToString() + "|" + System.Web.HttpUtility.UrlEncode(p[i].ToString()); // .Replace(",", "%44") 197 tmpStr += "," + p[i].GetType().ToString() + "|" + HttpUtility.UrlEncode(p[i].ToString()); // .Replace(",", "%44")
196 } 198 }
197 tmpStr += "\n"; 199 tmpStr += "\n";
198 byte[] byteData = Encoding.ASCII.GetBytes(tmpStr); 200 byte[] byteData = Encoding.ASCII.GetBytes(tmpStr);