aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorUbitUmarov2017-05-09 11:58:07 +0100
committerUbitUmarov2017-05-09 11:58:07 +0100
commit957ca41b13688be27c386e1b1d3db200c1ff0b87 (patch)
treebfec1b55b7bcd9a8ff84ff5936bae3ed9c600d75 /OpenSim/Region/Application
parentPGSQL: Add missing AgentPrefs.migrations (diff)
downloadopensim-SC_OLD-957ca41b13688be27c386e1b1d3db200c1ff0b87.zip
opensim-SC_OLD-957ca41b13688be27c386e1b1d3db200c1ff0b87.tar.gz
opensim-SC_OLD-957ca41b13688be27c386e1b1d3db200c1ff0b87.tar.bz2
opensim-SC_OLD-957ca41b13688be27c386e1b1d3db200c1ff0b87.tar.xz
remove file bin/Mono.Posix.dll that causes problems with mono
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 58178bc..7ac6eb9 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -126,6 +126,7 @@ namespace OpenSim
126 m_log.Info("[OPENSIM MAIN]: Using async_call_method " + Util.FireAndForgetMethod); 126 m_log.Info("[OPENSIM MAIN]: Using async_call_method " + Util.FireAndForgetMethod);
127 } 127 }
128 128
129#if (_MONO)
129 private static Mono.Unix.UnixSignal[] signals; 130 private static Mono.Unix.UnixSignal[] signals;
130 131
131 132
@@ -140,6 +141,7 @@ namespace OpenSim
140 MainConsole.Instance.RunCommand("shutdown"); 141 MainConsole.Instance.RunCommand("shutdown");
141 } 142 }
142 }); 143 });
144#endif
143 145
144 /// <summary> 146 /// <summary>
145 /// Performs initialisation of the scene, such as loading configuration from disk. 147 /// Performs initialisation of the scene, such as loading configuration from disk.
@@ -150,6 +152,7 @@ namespace OpenSim
150 m_log.Info("========================= STARTING OPENSIM ========================="); 152 m_log.Info("========================= STARTING OPENSIM =========================");
151 m_log.Info("===================================================================="); 153 m_log.Info("====================================================================");
152 154
155#if (_MONO)
153 if(!Util.IsWindows()) 156 if(!Util.IsWindows())
154 { 157 {
155 try 158 try
@@ -168,6 +171,7 @@ namespace OpenSim
168 m_log.Debug("Exception was: ", e); 171 m_log.Debug("Exception was: ", e);
169 } 172 }
170 } 173 }
174#endif
171 //m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString()); 175 //m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString());
172 // http://msdn.microsoft.com/en-us/library/bb384202.aspx 176 // http://msdn.microsoft.com/en-us/library/bb384202.aspx
173 //GCSettings.LatencyMode = GCLatencyMode.Batch; 177 //GCSettings.LatencyMode = GCLatencyMode.Batch;