Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim

OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs

@@ -1664,6 +1664,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             enablesimpacket.SimulatorInfo.IP += (uint)byteIP[1] << 8;
             enablesimpacket.SimulatorInfo.IP += (uint)byteIP[0];
             enablesimpacket.SimulatorInfo.Port = neighbourPort;
+
+            enablesimpacket.Header.Reliable = true; // ESP's should be reliable.
+
             OutPacket(enablesimpacket, ThrottleOutPacketType.Task);
         }
 

OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs

@@ -542,11 +542,39 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                     break;
                 case enumCompileType.cs:
                 case enumCompileType.lsl:
-                    lock (CScodeProvider)
+                    bool complete = false;
+                    bool retried  = false;
+                    do
                     {
-                        results = CScodeProvider.CompileAssemblyFromSource(
+						lock (CScodeProvider)
-                                parameters, Script);
+						{
+							results = CScodeProvider.CompileAssemblyFromSource(
+								parameters, Script);
+						}
+                        // Deal with an occasional segv in the compiler.
+                        // Rarely, if ever, occurs twice in succession.
+                        // Line # == 0 and no file name are indications that
+                        // this is a native stack trace rather than a normal
+                        // error log.
+                        if (results.Errors.Count > 0)
+                        {
+                            if (!retried && (results.Errors[0].FileName == null || results.Errors[0].FileName == String.Empty) &&
+                                results.Errors[0].Line == 0)
+                            {
+                                // System.Console.WriteLine("retrying failed compilation");
+                                retried = true;
+                            }
+                            else
+                            {
+                                complete = true;
+                            }
+                        }
+                        else
+                        {
+                            complete = true;
+                        }
                     }
+                    while(!complete);
                     break;
                 case enumCompileType.js:
                     results = JScodeProvider.CompileAssemblyFromSource(
@@ -567,17 +595,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             //
             // WARNINGS AND ERRORS
             //
-            int display = 5;
+            bool hadErrors = false;
+            string errtext = String.Empty;
+
             if (results.Errors.Count > 0)
             {
-                string errtext = String.Empty;
                 foreach (CompilerError CompErr in results.Errors)
                 {
-                    // Show 5 errors max
-                    //
-                    if (display <= 0)
-                        break;
-                    display--;
 
                     string severity = "Error";
                     if (CompErr.IsWarning)
@@ -587,36 +611,51 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
 
                     KeyValuePair<int, int> lslPos;
 
-                    lslPos = FindErrorPosition(CompErr.Line, CompErr.Column);
+                    // Show 5 errors max, but check entire list for errors
 
-                    string text = CompErr.ErrorText;
+                    if (severity == "Error")
+                    {
+						lslPos = FindErrorPosition(CompErr.Line, CompErr.Column);
+						string text = CompErr.ErrorText;
 
-                    // Use LSL type names
+						// Use LSL type names
-                    if (lang == enumCompileType.lsl)
+						if (lang == enumCompileType.lsl)
-                        text = ReplaceTypes(CompErr.ErrorText);
+							text = ReplaceTypes(CompErr.ErrorText);
 
-                    // The Second Life viewer's script editor begins
+						// The Second Life viewer's script editor begins
-                    // countingn lines and columns at 0, so we subtract 1.
+						// countingn lines and columns at 0, so we subtract 1.
-                    errtext += String.Format("Line ({0},{1}): {4} {2}: {3}\n",
+						errtext += String.Format("Line ({0},{1}): {4} {2}: {3}\n",
-                            lslPos.Key - 1, lslPos.Value - 1,
+								lslPos.Key - 1, lslPos.Value - 1,
-                            CompErr.ErrorNumber, text, severity);
+								CompErr.ErrorNumber, text, severity);
+                        hadErrors = true;
+                    }
                 }
-                
+            }
+
+            if (hadErrors)
+            {
+                throw new Exception(errtext);
+            }
+
+            //  On today's highly asynchronous systems, the result of
+            //  the compile may not be immediately apparent. Wait a 
+            //  reasonable amount of time before giving up on it.
+
+            if (!File.Exists(OutFile))
+            {
+                for (int i=0; i<20 && !File.Exists(OutFile); i++)
+                {
+                    System.Threading.Thread.Sleep(250);
+                }
+                // One final chance...
                 if (!File.Exists(OutFile))
                 {
+                    errtext = String.Empty;
+                    errtext += "No compile error. But not able to locate compiled file.";
                     throw new Exception(errtext);
                 }
             }
 
-            //
-            // NO ERRORS, BUT NO COMPILED FILE
-            //
-            if (!File.Exists(OutFile))
-            {
-                string errtext = String.Empty;
-                errtext += "No compile error. But not able to locate compiled file.";
-                throw new Exception(errtext);
-            }
 //            m_log.DebugFormat("[Compiler] Compiled new assembly "+
 //                    "for {0}", asset);
 
@@ -629,7 +668,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
 
             if (fi == null)
             {
-                string errtext = String.Empty;
+                errtext = String.Empty;
                 errtext += "No compile error. But not able to stat file.";
                 throw new Exception(errtext);
             }
@@ -644,7 +683,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             }
             catch (Exception)
             {
-                string errtext = String.Empty;
+                errtext = String.Empty;
                 errtext += "No compile error. But not able to open file.";
                 throw new Exception(errtext);
             }

bin/OpenSim.Grid.AssetServer.exe.config

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
-  </configSections>
-  <appSettings>
-  </appSettings>
-  <log4net>
-    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
-      </layout>
-    </appender>
-    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSim.Grid.AssetServer.log" />
-      <appendToFile value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date %-5level - %logger %message%newline" />
-      </layout>
-    </appender>
-
-    <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" -->
-    <logger name="NHibernate" additivity="false">
-      <level value="INFO"/>
-      <appender-ref ref="NHibernateFileLog"/>
-    </logger>
-
-
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="Console" />
-      <appender-ref ref="LogFileAppender" />
-    </root>
-  </log4net>
-</configuration>

bin/OpenSim.Grid.InventoryServer.exe.config

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
-  </configSections>
-  <appSettings>
-  </appSettings>
-  <log4net>
-    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
-      </layout>
-    </appender>
-    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSim.Grid.InventoryServer.log" />
-      <appendToFile value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date %-5level - %logger %message%newline" />
-      </layout>
-    </appender>
-
-    <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" -->
-    <logger name="NHibernate" additivity="false">
-      <level value="INFO"/>
-      <appender-ref ref="NHibernateFileLog"/>
-    </logger>
-
-
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="Console" />
-      <appender-ref ref="LogFileAppender" />
-    </root>
-  </log4net>
-</configuration>