5 files changed, 4 insertions, 22 deletions

diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index ba23216..2dbdce6 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -515,7 +515,7 @@ namespace OpenSim.Region.DataSnapshot
                     m_log.Warn("[DATASNAPSHOT] Unable to decode reply from data service. Ignoring. " + e.StackTrace);
                 }
                 // This is not quite working, so...
-                string responseStr = ASCIIEncoding.UTF8.GetString(response);
+                string responseStr = Encoding.UTF8.GetString(response);
                 m_log.Info("[DATASNAPSHOT] data service notified: " + url);
             }
 
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<LSO_Struct.CodeChunkArgument>();
             byte reader = br_read(1)[0];
-            reader = br_read(1)[0];
 
             // NOTE ON CODE CHUNK ARGUMENTS
             // This determins type definition
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
index 39babd6..c917e1e 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
@@ -656,21 +656,6 @@ namespace OpenSim.DataStore.MSSQL
 
 
             s.ExtraParams = (byte[]) row["ExtraParams"];
-            // System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding();
-            //             string texture = encoding.GetString((Byte[])row["Texture"]);
-            //             if (!texture.StartsWith("<"))
-            //             {
-            //                 //here so that we can still work with old format database files (ie from before I added xml serialization)
-            //                  LLObject.TextureEntry textureEntry = null;
-            //                 textureEntry = new LLObject.TextureEntry(new LLUUID(texture));
-            //                 s.TextureEntry = textureEntry.ToBytes();
-            //             }
-            //             else
-            //             {
-            //                 TextureBlock textureEntry = TextureBlock.FromXmlString(texture);
-            //                 s.TextureEntry = textureEntry.TextureData;
-            //                 s.ExtraParams = textureEntry.ExtraParams;
-            // }
 
             return s;
         }