diff options
| author | Melanie | 2013-06-04 21:09:25 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-04 21:09:25 +0100 |
| commit | 648e258b8e79e52df18f41f2ec79016a095f7766 (patch) | |
| tree | de96993d11a0183ac026cec61e0e5a937f801c3c /OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | New HttpServer_OpenSim.dll with increased limits on number of connections, re... (diff) | |
| download | opensim-SC-648e258b8e79e52df18f41f2ec79016a095f7766.zip opensim-SC-648e258b8e79e52df18f41f2ec79016a095f7766.tar.gz opensim-SC-648e258b8e79e52df18f41f2ec79016a095f7766.tar.bz2 opensim-SC-648e258b8e79e52df18f41f2ec79016a095f7766.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index c32820e..3849a3f 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | |||
| @@ -56,6 +56,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
| 56 | 56 | ||
| 57 | public LocalGridServicesConnector() | 57 | public LocalGridServicesConnector() |
| 58 | { | 58 | { |
| 59 | m_log.Debug("[LOCAL GRID SERVICE CONNECTOR]: LocalGridServicesConnector no parms."); | ||
| 59 | } | 60 | } |
| 60 | 61 | ||
| 61 | public LocalGridServicesConnector(IConfigSource source) | 62 | public LocalGridServicesConnector(IConfigSource source) |