Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Diva Canto 2012-11-27 14:43:01 -0800
committer: Diva Canto 2012-11-27 14:43:01 -0800
commit: a82f699f4348ea1ab139ab338973c9cee04df712 (patch)
tree: d1bf4948670e1d207fe4f6c60f6b7771e1625839 /OpenSim/Region/CoreModules/World/Wind/WindModule.cs
parent: Prevent the core Groups module from being enabled when its name doesn't match... (diff)
parent: BulletSim: reorganize linear movement routine into separate subroutines enabl... (diff)
download: opensim-SC_OLD-a82f699f4348ea1ab139ab338973c9cee04df712.zip
opensim-SC_OLD-a82f699f4348ea1ab139ab338973c9cee04df712.tar.gz
opensim-SC_OLD-a82f699f4348ea1ab139ab338973c9cee04df712.tar.bz2
opensim-SC_OLD-a82f699f4348ea1ab139ab338973c9cee04df712.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
index fd8e2b4..9de588c 100644
--- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules
        public void Initialise(IConfigSource config)
        {
            m_windConfig = config.Configs["Wind"];
-            string desiredWindPlugin = m_dWindPluginName;
+//            string desiredWindPlugin = m_dWindPluginName;
            if (m_windConfig != null)
            {
author	Diva Canto	2012-11-27 14:43:01 -0800
committer	Diva Canto	2012-11-27 14:43:01 -0800
commit	a82f699f4348ea1ab139ab338973c9cee04df712 (patch)
tree	d1bf4948670e1d207fe4f6c60f6b7771e1625839 /OpenSim/Region/CoreModules/World/Wind/WindModule.cs
parent	Prevent the core Groups module from being enabled when its name doesn't match... (diff)
parent	BulletSim: reorganize linear movement routine into separate subroutines enabl... (diff)
download	opensim-SC_OLD-a82f699f4348ea1ab139ab338973c9cee04df712.zip opensim-SC_OLD-a82f699f4348ea1ab139ab338973c9cee04df712.tar.gz opensim-SC_OLD-a82f699f4348ea1ab139ab338973c9cee04df712.tar.bz2 opensim-SC_OLD-a82f699f4348ea1ab139ab338973c9cee04df712.tar.xz

diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs index fd8e2b4..9de588c 100644 --- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs +++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules
66	public void Initialise(IConfigSource config)	66	public void Initialise(IConfigSource config)
67	{	67	{
68	m_windConfig = config.Configs["Wind"];	68	m_windConfig = config.Configs["Wind"];
69	string desiredWindPlugin = m_dWindPluginName;	69	// string desiredWindPlugin = m_dWindPluginName;
70		70
71	if (m_windConfig != null)	71	if (m_windConfig != null)
72	{	72	{