diff options
| author | Melanie | 2012-07-13 02:27:16 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-13 02:27:16 +0100 |
| commit | 64393a7ca89e2c7c6f032f9da096feb8db7fb24f (patch) | |
| tree | 12e0aaae0401cde2e4310f25efa96a64559ae939 /OpenSim/Region/ScriptEngine/Shared/Instance | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove a callstack print out I accidentally left in 2 commits ago in 9ccb578 (diff) | |
| download | opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.zip opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.gz opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.bz2 opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 3ddf1d4..8d92ba5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -954,7 +954,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 954 | try | 954 | try |
| 955 | { | 955 | { |
| 956 | FileStream fs = File.Create(Path.Combine(Path.GetDirectoryName(assembly), ItemID.ToString() + ".state")); | 956 | FileStream fs = File.Create(Path.Combine(Path.GetDirectoryName(assembly), ItemID.ToString() + ".state")); |
| 957 | Byte[] buf = (new UTF8Encoding()).GetBytes(xml); | 957 | Byte[] buf = Util.UTF8NoBomEncoding.GetBytes(xml); |
| 958 | fs.Write(buf, 0, buf.Length); | 958 | fs.Write(buf, 0, buf.Length); |
| 959 | fs.Close(); | 959 | fs.Close(); |
| 960 | } | 960 | } |