diff options
| author | Jeff Ames | 2009-10-01 09:38:36 +0900 |
|---|---|---|
| committer | Jeff Ames | 2009-10-01 09:38:36 +0900 |
| commit | 606e831ff5337fb5e94dcebf9d6852bd4c434d4b (patch) | |
| tree | bf53bcf7f7087b8595e4fdd43c705e1247e00102 /OpenSim/Region/CoreModules/World | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-606e831ff5337fb5e94dcebf9d6852bd4c434d4b.zip opensim-SC_OLD-606e831ff5337fb5e94dcebf9d6852bd4c434d4b.tar.gz opensim-SC_OLD-606e831ff5337fb5e94dcebf9d6852bd4c434d4b.tar.bz2 opensim-SC_OLD-606e831ff5337fb5e94dcebf9d6852bd4c434d4b.tar.xz | |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
4 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs index d9f377b..05d19a2 100644 --- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs | |||
| @@ -508,7 +508,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 508 | scene.WestBorders[0].TriggerRegionY = conn.RegionScene.RegionInfo.RegionLocY; | 508 | scene.WestBorders[0].TriggerRegionY = conn.RegionScene.RegionInfo.RegionLocY; |
| 509 | } | 509 | } |
| 510 | 510 | ||
| 511 | /* | 511 | /* |
| 512 | else | 512 | else |
| 513 | { | 513 | { |
| 514 | conn.RegionScene.NorthBorders[0].BorderLine.Z += (int)Constants.RegionSize; | 514 | conn.RegionScene.NorthBorders[0].BorderLine.Z += (int)Constants.RegionSize; |
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index b09c7a1..a9e0b7f 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
| @@ -103,7 +103,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 103 | //private uint PERM_MODIFY = (uint)16384; | 103 | //private uint PERM_MODIFY = (uint)16384; |
| 104 | private uint PERM_MOVE = (uint)524288; | 104 | private uint PERM_MOVE = (uint)524288; |
| 105 | private uint PERM_TRANS = (uint)8192; | 105 | private uint PERM_TRANS = (uint)8192; |
| 106 | private uint PERM_LOCKED = (uint)540672; | 106 | private uint PERM_LOCKED = (uint)540672; |
| 107 | 107 | ||
| 108 | /// <value> | 108 | /// <value> |
| 109 | /// Different user set names that come in from the configuration file. | 109 | /// Different user set names that come in from the configuration file. |
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs index 796b382..37f1f2e 100644 --- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs +++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs | |||
| @@ -90,6 +90,6 @@ namespace OpenSim.Region.CoreModules.World.Sound | |||
| 90 | p.ControllingClient.SendTriggeredSound( | 90 | p.ControllingClient.SendTriggeredSound( |
| 91 | soundId, ownerID, objectID, parentID, handle, position, (float)gain); | 91 | soundId, ownerID, objectID, parentID, handle, position, (float)gain); |
| 92 | } | 92 | } |
| 93 | } | 93 | } |
| 94 | } | 94 | } |
| 95 | } | 95 | } |
diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs index dcfb5a6..9d47e19 100644 --- a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs +++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs | |||
| @@ -46,7 +46,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins | |||
| 46 | 46 | ||
| 47 | private float m_avgStrength = 5.0f; // Average magnitude of the wind vector | 47 | private float m_avgStrength = 5.0f; // Average magnitude of the wind vector |
| 48 | private float m_avgDirection = 0.0f; // Average direction of the wind in degrees | 48 | private float m_avgDirection = 0.0f; // Average direction of the wind in degrees |
| 49 | private float m_varStrength = 5.0f; // Max Strength Variance | 49 | private float m_varStrength = 5.0f; // Max Strength Variance |
| 50 | private float m_varDirection = 30.0f;// Max Direction Variance | 50 | private float m_varDirection = 30.0f;// Max Direction Variance |
| 51 | private float m_rateChange = 1.0f; // | 51 | private float m_rateChange = 1.0f; // |
| 52 | 52 | ||