aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
diff options
context:
space:
mode:
authorMelanie2010-03-09 22:44:14 +0000
committerMelanie2010-03-09 22:44:14 +0000
commitc7590bfd507fa6f07dc1e4625ba032ed5d1201b4 (patch)
tree8f0f03d099d9ab4f1408a9cf8a1e50a4f81de1ae /OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
parent- parcel blocking, region crossing blocking, teleport blocking (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-c7590bfd507fa6f07dc1e4625ba032ed5d1201b4.zip
opensim-SC_OLD-c7590bfd507fa6f07dc1e4625ba032ed5d1201b4.tar.gz
opensim-SC_OLD-c7590bfd507fa6f07dc1e4625ba032ed5d1201b4.tar.bz2
opensim-SC_OLD-c7590bfd507fa6f07dc1e4625ba032ed5d1201b4.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index e913891..783d606 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
69 //IConfig userConfig = config.Configs["SimulationService"]; 69 //IConfig userConfig = config.Configs["SimulationService"];
70 //if (userConfig == null) 70 //if (userConfig == null)
71 //{ 71 //{
72 // m_log.Error("[AVATAR CONNECTOR]: SimulationService missing from OpanSim.ini"); 72 // m_log.Error("[AVATAR CONNECTOR]: SimulationService missing from OpenSim.ini");
73 // return; 73 // return;
74 //} 74 //}
75 75