From 76d8eaa4069d6445c47784168e274ba4253f7b9c Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Thu, 1 May 2008 18:50:44 +0000 Subject: * Thanks to Mic Bowman for inspiring me to look at that we are still using ASCIIEncoder in places we shouldn't. --- OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 2 +- OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs | 4 ++-- OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region/ScriptEngine') 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 return objectname; } - EntityBase SensedObject = null; + EntityBase SensedObject; lock (World.Entities) { 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 if (myIQS.QueueSize == 0) return; - string receivedData = Encoding.ASCII.GetString(myIQS.Queue, 0, myIQS.QueueSize); + string receivedData = Encoding.UTF8.GetString(myIQS.Queue, 0, myIQS.QueueSize); Debug.WriteLine("RAW: " + receivedData); byte newLine = 10; @@ -197,7 +197,7 @@ namespace OpenSim.Region.ScriptEngine.Common tmpStr += "," + p[i].GetType().ToString() + "|" + HttpUtility.UrlEncode(p[i].ToString()); // .Replace(",", "%44") } tmpStr += "\n"; - byte[] byteData = Encoding.ASCII.GetBytes(tmpStr); + byte[] byteData = Encoding.UTF8.GetBytes(tmpStr); TCPS.Send(ID, byteData, 0, byteData.Length); } } diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs index e4a57e8..06ae1e9 100644 --- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs +++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs @@ -289,10 +289,8 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO //} // READ EVENT CODE CHUNKS - LSO_Struct.CodeChunk[] myEventCodeChunk; if (myStateFrameBlock.StateCount > 0) { - myEventCodeChunk = new LSO_Struct.CodeChunk[myStateFrameBlock.StateCount]; for (int i = 0; i < myStateFrameBlock.StateCount; i++) { // TODO: Somehow organize events and functions so they can be found again, @@ -465,7 +463,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO // TODO: How to determine number of codechunks -- does this method work? myCodeChunk.CodeChunkArguments = new List(); byte reader = br_read(1)[0]; - reader = br_read(1)[0]; // NOTE ON CODE CHUNK ARGUMENTS // This determins type definition -- cgit v1.1