diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
4 files changed, 87 insertions, 14 deletions
diff --git a/OpenSim/Region/CoreModules/World/Wind/IWindModelPlugin.cs b/OpenSim/Region/CoreModules/World/Wind/IWindModelPlugin.cs index 6b495da..8e3e810 100644 --- a/OpenSim/Region/CoreModules/World/Wind/IWindModelPlugin.cs +++ b/OpenSim/Region/CoreModules/World/Wind/IWindModelPlugin.cs | |||
@@ -1,3 +1,30 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
1 | using System; | 28 | using System; |
2 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
3 | 30 | ||
diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs index 2a0bb73..2942792 100644 --- a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs +++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs | |||
@@ -1,3 +1,30 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
1 | using System; | 28 | using System; |
2 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
3 | using System.Reflection; | 30 | using System.Reflection; |
@@ -58,7 +85,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins | |||
58 | 85 | ||
59 | public void WindConfig(OpenSim.Region.Framework.Scenes.Scene scene, Nini.Config.IConfig windConfig) | 86 | public void WindConfig(OpenSim.Region.Framework.Scenes.Scene scene, Nini.Config.IConfig windConfig) |
60 | { | 87 | { |
61 | if( windConfig != null ) | 88 | if (windConfig != null) |
62 | { | 89 | { |
63 | // Uses strength value if avg_strength not specified | 90 | // Uses strength value if avg_strength not specified |
64 | m_avgStrength = windConfig.GetFloat("strength", 5.0F); | 91 | m_avgStrength = windConfig.GetFloat("strength", 5.0F); |
diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs index 837d6e7..8d35a71 100644 --- a/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs +++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs | |||
@@ -1,9 +1,35 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
1 | using System; | 28 | using System; |
2 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
3 | 30 | ||
4 | using OpenMetaverse; | 31 | using OpenMetaverse; |
5 | 32 | ||
6 | |||
7 | namespace OpenSim.Region.CoreModules.World.Wind.Plugins | 33 | namespace OpenSim.Region.CoreModules.World.Wind.Plugins |
8 | { | 34 | { |
9 | class SimpleRandomWind : Mono.Addins.TypeExtensionNode, IWindModelPlugin | 35 | class SimpleRandomWind : Mono.Addins.TypeExtensionNode, IWindModelPlugin |
@@ -12,7 +38,6 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins | |||
12 | private float m_strength = 1.0f; | 38 | private float m_strength = 1.0f; |
13 | private Random m_rndnums = new Random(Environment.TickCount); | 39 | private Random m_rndnums = new Random(Environment.TickCount); |
14 | 40 | ||
15 | |||
16 | #region IPlugin Members | 41 | #region IPlugin Members |
17 | 42 | ||
18 | public string Version | 43 | public string Version |
@@ -27,7 +52,6 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins | |||
27 | 52 | ||
28 | public void Initialise() | 53 | public void Initialise() |
29 | { | 54 | { |
30 | |||
31 | } | 55 | } |
32 | 56 | ||
33 | #endregion | 57 | #endregion |
@@ -45,9 +69,9 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins | |||
45 | 69 | ||
46 | public void WindConfig(OpenSim.Region.Framework.Scenes.Scene scene, Nini.Config.IConfig windConfig) | 70 | public void WindConfig(OpenSim.Region.Framework.Scenes.Scene scene, Nini.Config.IConfig windConfig) |
47 | { | 71 | { |
48 | if( windConfig != null ) | 72 | if (windConfig != null) |
49 | { | 73 | { |
50 | if( windConfig.Contains("strength") ) | 74 | if (windConfig.Contains("strength")) |
51 | { | 75 | { |
52 | m_strength = windConfig.GetFloat("strength", 1.0F); | 76 | m_strength = windConfig.GetFloat("strength", 1.0F); |
53 | } | 77 | } |
@@ -87,7 +111,6 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins | |||
87 | } | 111 | } |
88 | 112 | ||
89 | return windVector; | 113 | return windVector; |
90 | |||
91 | } | 114 | } |
92 | 115 | ||
93 | public Vector2[] WindLLClientArray() | 116 | public Vector2[] WindLLClientArray() |
diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs index 52df3bc..700fe2f 100644 --- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs +++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs | |||
@@ -225,9 +225,8 @@ namespace OpenSim.Region.CoreModules | |||
225 | { | 225 | { |
226 | ValidateConsole(); | 226 | ValidateConsole(); |
227 | 227 | ||
228 | if( (cmdparams.Length != 4) | 228 | if ((cmdparams.Length != 4) |
229 | || !cmdparams[1].Equals("base") | 229 | || !cmdparams[1].Equals("base")) |
230 | ) | ||
231 | { | 230 | { |
232 | m_log.Info("[WIND] Invalid parameters to change parameters for Wind module base, usage: wind base <parameter> <value>"); | 231 | m_log.Info("[WIND] Invalid parameters to change parameters for Wind module base, usage: wind base <parameter> <value>"); |
233 | return; | 232 | return; |
@@ -452,14 +451,11 @@ namespace OpenSim.Region.CoreModules | |||
452 | 451 | ||
453 | private void GenWindPos() | 452 | private void GenWindPos() |
454 | { | 453 | { |
455 | if( m_activeWindPlugin != null ) | 454 | if (m_activeWindPlugin != null) |
456 | { | 455 | { |
457 | // Tell Wind Plugin to update it's wind data | 456 | // Tell Wind Plugin to update it's wind data |
458 | m_activeWindPlugin.WindUpdate(m_frame); | 457 | m_activeWindPlugin.WindUpdate(m_frame); |
459 | } | 458 | } |
460 | } | 459 | } |
461 | |||
462 | |||
463 | |||
464 | } | 460 | } |
465 | } | 461 | } |