Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminster

2 files changed, 9 insertions, 17 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 0c7f49b..5386a28 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5571,25 +5571,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// separated list. There is a space after
         /// each comma.
         /// </summary>
-
         public LSL_String llList2CSV(LSL_List src)
         {
-
-            string ret = String.Empty;
-            int    x   = 0;
-
             m_host.AddScriptLPS(1);
 
-            if (src.Data.Length > 0)
-            {
-                ret = src.Data[x++].ToString();
-                for (; x < src.Data.Length; x++)
-                {
-                    ret += ", "+src.Data[x].ToString();
-                }
-            }
-
-            return ret;
+            return string.Join(", ", 
+                    (new List<object>(src.Data)).ConvertAll<string>(o => 
+                    {
+                        return o.ToString();
+                    }).ToArray());
         }
 
         /// <summary>
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 2d17977..9f05666 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -994,6 +994,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 // This delay exists to stop mono problems where script compilation and startup would stop the sim
                 // working properly for the session.
                 System.Threading.Thread.Sleep(m_StartDelay);
+
+                m_log.InfoFormat("[XEngine]: Performing initial script startup on {0}", m_Scene.Name);
             }
 
             object[] o;
@@ -1009,13 +1011,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     if (m_InitialStartup)
                         if (scriptsStarted % 50 == 0)
                             m_log.InfoFormat(
-                                "[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.RegionInfo.RegionName);
+                                "[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.Name);
                 }
             }
 
             if (m_InitialStartup)
                 m_log.InfoFormat(
-                    "[XEngine]: Completed starting {0} scripts on {1}", scriptsStarted, m_Scene.RegionInfo.RegionName);
+                    "[XEngine]: Completed starting {0} scripts on {1}", scriptsStarted, m_Scene.Name);
 
             // NOTE: Despite having a lockless queue, this lock is required
             // to make sure there is never no compile thread while there