Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmerge

author: Melanie 2011-10-25 03:17:59 +0100
committer: Melanie 2011-10-25 03:17:59 +0100
commit: 6d4480c1cabdd91d956f9645cae50e9a99bb9d4d (patch)
tree: cfe24e6fe40801448d423e984da19f4b78b290e0 /OpenSim/Region/OptionalModules/Scripting
parent: Merge commit '6837e44d0707e501795df2d690c6005f5ba1d591' into bigmerge (diff)
parent: Get OdeScene to use passed in time step rather than hard-coded 0.089 (diff)
download: opensim-SC_OLD-6d4480c1cabdd91d956f9645cae50e9a99bb9d4d.zip
opensim-SC_OLD-6d4480c1cabdd91d956f9645cae50e9a99bb9d4d.tar.gz
opensim-SC_OLD-6d4480c1cabdd91d956f9645cae50e9a99bb9d4d.tar.bz2
opensim-SC_OLD-6d4480c1cabdd91d956f9645cae50e9a99bb9d4d.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
index 963d1e2..4c4f5fb 100644
--- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
            m_log.DebugFormat("[RegionReady]: Enabled for region {0}", scene.RegionInfo.RegionName);
-            if(m_disable_logins == true)
+            if (m_disable_logins == true)
            {
                scene.LoginLock = true;
                scene.LoginsDisabled = true;
author	Melanie	2011-10-25 03:17:59 +0100
committer	Melanie	2011-10-25 03:17:59 +0100
commit	6d4480c1cabdd91d956f9645cae50e9a99bb9d4d (patch)
tree	cfe24e6fe40801448d423e984da19f4b78b290e0 /OpenSim/Region/OptionalModules/Scripting
parent	Merge commit '6837e44d0707e501795df2d690c6005f5ba1d591' into bigmerge (diff)
parent	Get OdeScene to use passed in time step rather than hard-coded 0.089 (diff)
download	opensim-SC_OLD-6d4480c1cabdd91d956f9645cae50e9a99bb9d4d.zip opensim-SC_OLD-6d4480c1cabdd91d956f9645cae50e9a99bb9d4d.tar.gz opensim-SC_OLD-6d4480c1cabdd91d956f9645cae50e9a99bb9d4d.tar.bz2 opensim-SC_OLD-6d4480c1cabdd91d956f9645cae50e9a99bb9d4d.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs index 963d1e2..4c4f5fb 100644 --- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
105		105
106	m_log.DebugFormat("[RegionReady]: Enabled for region {0}", scene.RegionInfo.RegionName);	106	m_log.DebugFormat("[RegionReady]: Enabled for region {0}", scene.RegionInfo.RegionName);
107		107
108	if(m_disable_logins == true)	108	if (m_disable_logins == true)
109	{	109	{
110	scene.LoginLock = true;	110	scene.LoginLock = true;
111	scene.LoginsDisabled = true;	111	scene.LoginsDisabled = true;