Merge branch 'master' of /home/opensim/var/repo/opensim

1 files changed, 5 insertions, 3 deletions

diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 23a4cf9..a9b6e67 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1812,9 +1812,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                         // if there already exists a file at that location, it may be locked.
                         m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", path, ex.Message);
                     }
+
+                    string textpath = path + ".text";
                     try
                     {
-                        using (FileStream fs = File.Create(path + ".text"))
+                        using (FileStream fs = File.Create(textpath))
                         {
                             using (StreamWriter sw = new StreamWriter(fs))
                             {
@@ -1827,7 +1829,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     catch (IOException ex)
                     {
                         // if there already exists a file at that location, it may be locked.
-                        m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", path, ex.Message);
+                        m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", textpath, ex.Message);
                     }
                 }
             }
@@ -1876,7 +1878,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 catch (IOException ex)
                 {
                     // if there already exists a file at that location, it may be locked.
-                    m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", statepath, ex.Message);
+                    m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", mappath, ex.Message);
                 }
             }