diff options
| author | Melanie | 2011-01-23 23:29:25 +0000 |
|---|---|---|
| committer | Melanie | 2011-01-23 23:29:25 +0000 |
| commit | 105deab601244584d779e8b7d1e8275b8aeb15ec (patch) | |
| tree | 63e2f064a748fddcaa566fde915ee56e8546220b /OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs | |
| parent | Completely nixing flags from the client causes wearables to break. Fix it (diff) | |
| parent | Fixes mantis #5343 (diff) | |
| download | opensim-SC_OLD-105deab601244584d779e8b7d1e8275b8aeb15ec.zip opensim-SC_OLD-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.gz opensim-SC_OLD-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.bz2 opensim-SC_OLD-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs')
| -rw-r--r-- | OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs b/OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs index c9e80d9..8472d34 100644 --- a/OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs +++ b/OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs | |||
| @@ -39,7 +39,7 @@ namespace OpenSim.Server.Handlers.Grid | |||
| 39 | { | 39 | { |
| 40 | public class GridInfoServerInConnector : ServiceConnector | 40 | public class GridInfoServerInConnector : ServiceConnector |
| 41 | { | 41 | { |
| 42 | private string m_ConfigName = "GridInfoService"; | 42 | // private string m_ConfigName = "GridInfoService"; |
| 43 | 43 | ||
| 44 | public GridInfoServerInConnector(IConfigSource config, IHttpServer server, string configName) : | 44 | public GridInfoServerInConnector(IConfigSource config, IHttpServer server, string configName) : |
| 45 | base(config, server, configName) | 45 | base(config, server, configName) |