aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/InterGrid
diff options
context:
space:
mode:
authorMelanie2010-08-21 00:32:26 +0100
committerMelanie2010-08-21 00:32:26 +0100
commitf8ff98577ef3e576326c6eea28cb12ebb4e0bdc4 (patch)
tree3ef10e646ddda95929142eb2c3774b42d0923b3b /OpenSim/Region/CoreModules/InterGrid
parentForward-port a small improvement to the land out connector (diff)
parentForward-port a small improvement to the land out connector (diff)
downloadopensim-SC-f8ff98577ef3e576326c6eea28cb12ebb4e0bdc4.zip
opensim-SC-f8ff98577ef3e576326c6eea28cb12ebb4e0bdc4.tar.gz
opensim-SC-f8ff98577ef3e576326c6eea28cb12ebb4e0bdc4.tar.bz2
opensim-SC-f8ff98577ef3e576326c6eea28cb12ebb4e0bdc4.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/InterGrid')
-rw-r--r--OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
index 87a0a8d..fd0e879 100644
--- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
@@ -100,7 +100,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
100 bool enabled = false; 100 bool enabled = false;
101 IConfig cfg = null; 101 IConfig cfg = null;
102 IConfig httpcfg = null; 102 IConfig httpcfg = null;
103 IConfig startupcfg = null; 103// IConfig startupcfg = null;
104 try 104 try
105 { 105 {
106 cfg = config.Configs["OpenGridProtocol"]; 106 cfg = config.Configs["OpenGridProtocol"];
@@ -117,14 +117,14 @@ namespace OpenSim.Region.CoreModules.InterGrid
117 { 117 {
118 118
119 } 119 }
120 try 120// try
121 { 121// {
122 startupcfg = config.Configs["Startup"]; 122// startupcfg = config.Configs["Startup"];
123 } 123// }
124 catch (NullReferenceException) 124// catch (NullReferenceException)
125 { 125// {
126 126//
127 } 127// }
128 128
129// if (startupcfg != null) 129// if (startupcfg != null)
130// { 130// {