diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs | 3 |
3 files changed, 3 insertions, 6 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 | } |
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 | |||
289 | 289 | ||
290 | //} | 290 | //} |
291 | // READ EVENT CODE CHUNKS | 291 | // READ EVENT CODE CHUNKS |
292 | LSO_Struct.CodeChunk[] myEventCodeChunk; | ||
293 | if (myStateFrameBlock.StateCount > 0) | 292 | if (myStateFrameBlock.StateCount > 0) |
294 | { | 293 | { |
295 | myEventCodeChunk = new LSO_Struct.CodeChunk[myStateFrameBlock.StateCount]; | ||
296 | for (int i = 0; i < myStateFrameBlock.StateCount; i++) | 294 | for (int i = 0; i < myStateFrameBlock.StateCount; i++) |
297 | { | 295 | { |
298 | // TODO: Somehow organize events and functions so they can be found again, | 296 | // TODO: Somehow organize events and functions so they can be found again, |
@@ -465,7 +463,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO | |||
465 | // TODO: How to determine number of codechunks -- does this method work? | 463 | // TODO: How to determine number of codechunks -- does this method work? |
466 | myCodeChunk.CodeChunkArguments = new List<LSO_Struct.CodeChunkArgument>(); | 464 | myCodeChunk.CodeChunkArguments = new List<LSO_Struct.CodeChunkArgument>(); |
467 | byte reader = br_read(1)[0]; | 465 | byte reader = br_read(1)[0]; |
468 | reader = br_read(1)[0]; | ||
469 | 466 | ||
470 | // NOTE ON CODE CHUNK ARGUMENTS | 467 | // NOTE ON CODE CHUNK ARGUMENTS |
471 | // This determins type definition | 468 | // This determins type definition |