diff options
author | Tedd Hansen | 2008-02-16 07:53:02 +0000 |
---|---|---|
committer | Tedd Hansen | 2008-02-16 07:53:02 +0000 |
commit | 169032b4a42736b3feef682fcbfd1cc1f8b159ba (patch) | |
tree | f452996b38d6c84c9b9c204040dab13cb3c43d77 /OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |
parent | * ODE Stability update 4 :D (diff) | |
download | opensim-SC_OLD-169032b4a42736b3feef682fcbfd1cc1f8b159ba.zip opensim-SC_OLD-169032b4a42736b3feef682fcbfd1cc1f8b159ba.tar.gz opensim-SC_OLD-169032b4a42736b3feef682fcbfd1cc1f8b159ba.tar.bz2 opensim-SC_OLD-169032b4a42736b3feef682fcbfd1cc1f8b159ba.tar.xz |
Fixed ScriptEngine config in OpenSim.ini.example that was out of place.
Added some info to failure on GridServices listening port so people can see what actually went wrong.
Moved most of the function/event execution module to a baseclass so other execution methods (instead of reflection) can be used with custom script modules run by ScriptEngine.Common.
+ some accumulated patches
Diffstat (limited to 'OpenSim/Region/Communications/OGS1/OGS1GridServices.cs')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 0150e36..5d38b83 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -499,8 +499,17 @@ namespace OpenSim.Region.Communications.OGS1 | |||
499 | /// </summary> | 499 | /// </summary> |
500 | private void StartRemoting() | 500 | private void StartRemoting() |
501 | { | 501 | { |
502 | TcpChannel ch = new TcpChannel((int) NetworkServersInfo.RemotingListenerPort); | 502 | TcpChannel ch; |
503 | ChannelServices.RegisterChannel(ch, false); // Disabled security as Mono doesnt support this. | 503 | try |
504 | { | ||
505 | ch = new TcpChannel((int)NetworkServersInfo.RemotingListenerPort); | ||
506 | ChannelServices.RegisterChannel(ch, false); // Disabled security as Mono doesnt support this. | ||
507 | } | ||
508 | catch (Exception ex) | ||
509 | { | ||
510 | m_log.Error("Exception while attempting to listen on TCP port " + (int)NetworkServersInfo.RemotingListenerPort + "."); | ||
511 | throw (ex); | ||
512 | } | ||
504 | 513 | ||
505 | WellKnownServiceTypeEntry wellType = | 514 | WellKnownServiceTypeEntry wellType = |
506 | new WellKnownServiceTypeEntry(typeof (OGS1InterRegionRemoting), "InterRegions", | 515 | new WellKnownServiceTypeEntry(typeof (OGS1InterRegionRemoting), "InterRegions", |