aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs3
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs3
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs7
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs19
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs2
11 files changed, 22 insertions, 40 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
index 2c04008..8c0ef88 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
@@ -46,8 +46,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
46 { 46 {
47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 48
49 protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();
50
51 /// <summary> 49 /// <summary>
52 /// Store for asset data we received before we get the metadata 50 /// Store for asset data we received before we get the metadata
53 /// </summary> 51 /// </summary>
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
index 7a0db26..b5c7d33 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
@@ -252,7 +252,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
252 if (horizontalScale < 0.01d) 252 if (horizontalScale < 0.01d)
253 horizontalScale = 0.01d; 253 horizontalScale = 0.01d;
254 254
255 System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding(); 255 Encoding enc = Encoding.ASCII;
256 256
257 bs.Write(enc.GetBytes("TERRAGENTERRAIN ")); 257 bs.Write(enc.GetBytes("TERRAGENTERRAIN "));
258 258
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index be8873d..7fafdc6 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -823,11 +823,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
823 m_log.DebugFormat("[FreeSwitchVoice]: Region:Parcel \"{0}\": parcel id {1}: using channel name {2}", 823 m_log.DebugFormat("[FreeSwitchVoice]: Region:Parcel \"{0}\": parcel id {1}: using channel name {2}",
824 landName, land.LocalID, landUUID); 824 landName, land.LocalID, landUUID);
825 } 825 }
826 System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding();
827 826
828 // slvoice handles the sip address differently if it begins with confctl, hiding it from the user in the friends list. however it also disables 827 // slvoice handles the sip address differently if it begins with confctl, hiding it from the user in the friends list. however it also disables
829 // the personal speech indicators as well unless some siren14-3d codec magic happens. we dont have siren143d so we'll settle for the personal speech indicator. 828 // the personal speech indicators as well unless some siren14-3d codec magic happens. we dont have siren143d so we'll settle for the personal speech indicator.
830 channelUri = String.Format("sip:conf-{0}@{1}", "x" + Convert.ToBase64String(encoding.GetBytes(landUUID)), m_freeSwitchRealm); 829 channelUri = String.Format("sip:conf-{0}@{1}", "x" + Convert.ToBase64String(Encoding.ASCII.GetBytes(landUUID)), m_freeSwitchRealm);
831 830
832 lock (m_ParcelAddress) 831 lock (m_ParcelAddress)
833 { 832 {
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
index 52fc27d..61aaf04 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
@@ -1120,7 +1120,6 @@ namespace Nwc.XmlRpc
1120 /// <summary>Class supporting the request side of an XML-RPC transaction.</summary> 1120 /// <summary>Class supporting the request side of an XML-RPC transaction.</summary>
1121 public class ConfigurableKeepAliveXmlRpcRequest : XmlRpcRequest 1121 public class ConfigurableKeepAliveXmlRpcRequest : XmlRpcRequest
1122 { 1122 {
1123 private Encoding _encoding = new ASCIIEncoding();
1124 private XmlRpcRequestSerializer _serializer = new XmlRpcRequestSerializer(); 1123 private XmlRpcRequestSerializer _serializer = new XmlRpcRequestSerializer();
1125 private XmlRpcResponseDeserializer _deserializer = new XmlRpcResponseDeserializer(); 1124 private XmlRpcResponseDeserializer _deserializer = new XmlRpcResponseDeserializer();
1126 private bool _disableKeepAlive = true; 1125 private bool _disableKeepAlive = true;
@@ -1153,7 +1152,7 @@ namespace Nwc.XmlRpc
1153 request.KeepAlive = !_disableKeepAlive; 1152 request.KeepAlive = !_disableKeepAlive;
1154 1153
1155 Stream stream = request.GetRequestStream(); 1154 Stream stream = request.GetRequestStream();
1156 XmlTextWriter xml = new XmlTextWriter(stream, _encoding); 1155 XmlTextWriter xml = new XmlTextWriter(stream, Encoding.ASCII);
1157 _serializer.Serialize(xml, this); 1156 _serializer.Serialize(xml, this);
1158 xml.Flush(); 1157 xml.Flush();
1159 xml.Close(); 1158 xml.Close();
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
index 4949097..eaba816 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
@@ -425,10 +425,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
425 425
426 try 426 try
427 { 427 {
428 System.Text.UTF8Encoding enc = new System.Text.UTF8Encoding(); 428 string jsondata = SLUtil.ParseNotecardToString(Encoding.UTF8.GetString(a.Data));
429 string jsondata = SLUtil.ParseNotecardToString(enc.GetString(a.Data)); 429 int result = m_store.SetValue(storeID, path, jsondata,true) ? 1 : 0;
430 int result = m_store.SetValue(storeID,path,jsondata,true) ? 1 : 0; 430 m_comms.DispatchReply(scriptID,result, "", reqID.ToString());
431 m_comms.DispatchReply(scriptID,result,"",reqID.ToString());
432 return; 431 return;
433 } 432 }
434 catch (Exception e) 433 catch (Exception e)
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index 74f5208..03481d2 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -482,10 +482,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
482 // Convert to base64 482 // Convert to base64
483 // 483 //
484 string filetext = Convert.ToBase64String(data); 484 string filetext = Convert.ToBase64String(data);
485 485 Byte[] buf = Encoding.ASCII.GetBytes(filetext);
486 ASCIIEncoding enc = new ASCIIEncoding();
487
488 Byte[] buf = enc.GetBytes(filetext);
489 486
490 m_log.Info("MRM 9"); 487 m_log.Info("MRM 9");
491 488
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 0a25454..0ebcd8d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -10536,9 +10536,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10536 return; 10536 return;
10537 } 10537 }
10538 10538
10539 System.Text.UTF8Encoding enc = 10539 string data = Encoding.UTF8.GetString(a.Data);
10540 new System.Text.UTF8Encoding();
10541 string data = enc.GetString(a.Data);
10542 //m_log.Debug(data); 10540 //m_log.Debug(data);
10543 NotecardCache.Cache(id, data); 10541 NotecardCache.Cache(id, data);
10544 AsyncCommands. 10542 AsyncCommands.
@@ -10591,9 +10589,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10591 return; 10589 return;
10592 } 10590 }
10593 10591
10594 System.Text.UTF8Encoding enc = 10592 string data = Encoding.UTF8.GetString(a.Data);
10595 new System.Text.UTF8Encoding();
10596 string data = enc.GetString(a.Data);
10597 //m_log.Debug(data); 10593 //m_log.Debug(data);
10598 NotecardCache.Cache(id, data); 10594 NotecardCache.Cache(id, data);
10599 AsyncCommands.DataserverPlugin.DataserverReply(id.ToString(), 10595 AsyncCommands.DataserverPlugin.DataserverReply(id.ToString(),
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index e90f577..cfa08c2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1811,8 +1811,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1811 if (a == null) 1811 if (a == null)
1812 return UUID.Zero; 1812 return UUID.Zero;
1813 1813
1814 System.Text.UTF8Encoding enc = new System.Text.UTF8Encoding(); 1814 string data = Encoding.UTF8.GetString(a.Data);
1815 string data = enc.GetString(a.Data);
1816 NotecardCache.Cache(assetID, data); 1815 NotecardCache.Cache(assetID, data);
1817 }; 1816 };
1818 1817
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 8f2ec49..17a0d69 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
31using System.Globalization; 31using System.Globalization;
32using System.Reflection; 32using System.Reflection;
33using System.IO; 33using System.IO;
34using System.Text;
34using Microsoft.CSharp; 35using Microsoft.CSharp;
35//using Microsoft.JScript; 36//using Microsoft.JScript;
36using Microsoft.VisualBasic; 37using Microsoft.VisualBasic;
@@ -711,9 +712,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
711 // 712 //
712 string filetext = System.Convert.ToBase64String(data); 713 string filetext = System.Convert.ToBase64String(data);
713 714
714 System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding(); 715 Byte[] buf = Encoding.ASCII.GetBytes(filetext);
715
716 Byte[] buf = enc.GetBytes(filetext);
717 716
718 FileStream sfs = File.Create(assembly + ".text"); 717 FileStream sfs = File.Create(assembly + ".text");
719 sfs.Write(buf, 0, buf.Length); 718 sfs.Write(buf, 0, buf.Length);
@@ -804,8 +803,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
804 mapstring += String.Format("{0},{1},{2},{3}\n", k.Key, k.Value, v.Key, v.Value); 803 mapstring += String.Format("{0},{1},{2},{3}\n", k.Key, k.Value, v.Key, v.Value);
805 } 804 }
806 805
807 System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding(); 806 Byte[] mapbytes = Encoding.ASCII.GetBytes(mapstring);
808 Byte[] mapbytes = enc.GetBytes(mapstring);
809 FileStream mfs = File.Create(filename); 807 FileStream mfs = File.Create(filename);
810 mfs.Write(mapbytes, 0, mapbytes.Length); 808 mfs.Write(mapbytes, 0, mapbytes.Length);
811 mfs.Close(); 809 mfs.Close();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 306090e..1c0cac7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -26,15 +26,16 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic;
31using System.Globalization;
29using System.IO; 32using System.IO;
33using System.Reflection;
30using System.Runtime.Remoting; 34using System.Runtime.Remoting;
31using System.Runtime.Remoting.Lifetime; 35using System.Runtime.Remoting.Lifetime;
32using System.Threading;
33using System.Collections;
34using System.Collections.Generic;
35using System.Security.Policy; 36using System.Security.Policy;
36using System.Reflection; 37using System.Text;
37using System.Globalization; 38using System.Threading;
38using System.Xml; 39using System.Xml;
39using OpenMetaverse; 40using OpenMetaverse;
40using log4net; 41using log4net;
@@ -298,13 +299,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
298 using (FileStream fs = File.Open(savedState, 299 using (FileStream fs = File.Open(savedState,
299 FileMode.Open, FileAccess.Read, FileShare.None)) 300 FileMode.Open, FileAccess.Read, FileShare.None))
300 { 301 {
301 System.Text.UTF8Encoding enc =
302 new System.Text.UTF8Encoding();
303
304 Byte[] data = new Byte[size]; 302 Byte[] data = new Byte[size];
305 fs.Read(data, 0, size); 303 fs.Read(data, 0, size);
306 304
307 xml = enc.GetString(data); 305 xml = Encoding.UTF8.GetString(data);
308 306
309 ScriptSerializer.Deserialize(xml, this); 307 ScriptSerializer.Deserialize(xml, this);
310 308
@@ -954,8 +952,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
954 try 952 try
955 { 953 {
956 FileStream fs = File.Create(Path.Combine(Path.GetDirectoryName(assembly), ItemID.ToString() + ".state")); 954 FileStream fs = File.Create(Path.Combine(Path.GetDirectoryName(assembly), ItemID.ToString() + ".state"));
957 System.Text.UTF8Encoding enc = new System.Text.UTF8Encoding(); 955 Byte[] buf = (new UTF8Encoding()).GetBytes(xml);
958 Byte[] buf = enc.GetBytes(xml);
959 fs.Write(buf, 0, buf.Length); 956 fs.Write(buf, 0, buf.Length);
960 fs.Close(); 957 fs.Close();
961 } 958 }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index f768cf2..20fad05 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1763,7 +1763,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1763 tfs.Read(tdata, 0, tdata.Length); 1763 tfs.Read(tdata, 0, tdata.Length);
1764 } 1764 }
1765 1765
1766 assem = new System.Text.ASCIIEncoding().GetString(tdata); 1766 assem = Encoding.ASCII.GetString(tdata);
1767 } 1767 }
1768 catch (Exception e) 1768 catch (Exception e)
1769 { 1769 {