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 | |
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-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.zip opensim-SC-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.gz opensim-SC-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.bz2 opensim-SC-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 4d20f7b..bc20f71 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -883,13 +883,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
883 | if (World.Entities.ContainsKey((UUID)agent) && World.Entities[avatarID] is ScenePresence) | 883 | if (World.Entities.ContainsKey((UUID)agent) && World.Entities[avatarID] is ScenePresence) |
884 | { | 884 | { |
885 | ScenePresence target = (ScenePresence)World.Entities[avatarID]; | 885 | ScenePresence target = (ScenePresence)World.Entities[avatarID]; |
886 | EndPoint ep = target.ControllingClient.GetClientEP(); | 886 | return target.ControllingClient.RemoteEndPoint.Address.ToString(); |
887 | if (ep is IPEndPoint) | ||
888 | { | ||
889 | IPEndPoint ip = (IPEndPoint)ep; | ||
890 | return ip.Address.ToString(); | ||
891 | } | ||
892 | } | 887 | } |
888 | |||
893 | // fall through case, just return nothing | 889 | // fall through case, just return nothing |
894 | return ""; | 890 | return ""; |
895 | } | 891 | } |
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 | } |