diff options
author | Adam Frisby | 2008-05-01 18:50:44 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-01 18:50:44 +0000 |
commit | 76d8eaa4069d6445c47784168e274ba4253f7b9c (patch) | |
tree | 6f0f023b9c994253f3f6808edf94949c7ebd2d29 /OpenSim/Region/ScriptEngine/Common | |
parent | Attempt to locate SL client in LaunchSLClient under other Unices. (diff) | |
download | opensim-SC_OLD-76d8eaa4069d6445c47784168e274ba4253f7b9c.zip opensim-SC_OLD-76d8eaa4069d6445c47784168e274ba4253f7b9c.tar.gz opensim-SC_OLD-76d8eaa4069d6445c47784168e274ba4253f7b9c.tar.bz2 opensim-SC_OLD-76d8eaa4069d6445c47784168e274ba4253f7b9c.tar.xz |
* Thanks to Mic Bowman for inspiring me to look at that we are still using ASCIIEncoder in places we shouldn't.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 419ca8f..67c6ad2 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -583,7 +583,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
583 | return objectname; | 583 | return objectname; |
584 | } | 584 | } |
585 | 585 | ||
586 | EntityBase SensedObject = null; | 586 | EntityBase SensedObject; |
587 | lock (World.Entities) | 587 | lock (World.Entities) |
588 | { | 588 | { |
589 | World.Entities.TryGetValue(objecUUID, out SensedObject); | 589 | World.Entities.TryGetValue(objecUUID, out SensedObject); |
diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs b/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs index 013ae0f..c293ecb 100644 --- a/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs +++ b/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs | |||
@@ -119,7 +119,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
119 | if (myIQS.QueueSize == 0) | 119 | if (myIQS.QueueSize == 0) |
120 | return; | 120 | return; |
121 | 121 | ||
122 | string receivedData = Encoding.ASCII.GetString(myIQS.Queue, 0, myIQS.QueueSize); | 122 | string receivedData = Encoding.UTF8.GetString(myIQS.Queue, 0, myIQS.QueueSize); |
123 | Debug.WriteLine("RAW: " + receivedData); | 123 | Debug.WriteLine("RAW: " + receivedData); |
124 | 124 | ||
125 | byte newLine = 10; | 125 | byte newLine = 10; |
@@ -197,7 +197,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
197 | tmpStr += "," + p[i].GetType().ToString() + "|" + HttpUtility.UrlEncode(p[i].ToString()); // .Replace(",", "%44") | 197 | tmpStr += "," + p[i].GetType().ToString() + "|" + HttpUtility.UrlEncode(p[i].ToString()); // .Replace(",", "%44") |
198 | } | 198 | } |
199 | tmpStr += "\n"; | 199 | tmpStr += "\n"; |
200 | byte[] byteData = Encoding.ASCII.GetBytes(tmpStr); | 200 | byte[] byteData = Encoding.UTF8.GetBytes(tmpStr); |
201 | TCPS.Send(ID, byteData, 0, byteData.Length); | 201 | TCPS.Send(ID, byteData, 0, byteData.Length); |
202 | } | 202 | } |
203 | } | 203 | } |