diff options
| author | Jeff Ames | 2008-08-10 00:44:33 +0000 |
|---|---|---|
| committer | Jeff Ames | 2008-08-10 00:44:33 +0000 |
| commit | 20e8e0ebae89398a0bf37b3b30c3111b419421ab (patch) | |
| tree | cb0291b915af3b031e311a23769e833fe70cb6cd /OpenSim | |
| parent | * Resolve mantis 1911 without reintroducing warnings (diff) | |
| download | opensim-SC_OLD-20e8e0ebae89398a0bf37b3b30c3111b419421ab.zip opensim-SC_OLD-20e8e0ebae89398a0bf37b3b30c3111b419421ab.tar.gz opensim-SC_OLD-20e8e0ebae89398a0bf37b3b30c3111b419421ab.tar.bz2 opensim-SC_OLD-20e8e0ebae89398a0bf37b3b30c3111b419421ab.tar.xz | |
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim')
3 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 7c05d2a..c261961 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
| @@ -1554,8 +1554,6 @@ namespace OpenSim.Region.Communications.OGS1 | |||
| 1554 | 1554 | ||
| 1555 | #endregion | 1555 | #endregion |
| 1556 | 1556 | ||
| 1557 | // helper to see if remote region is up | ||
| 1558 | |||
| 1559 | int timeOut = 10; //10 seconds | 1557 | int timeOut = 10; //10 seconds |
| 1560 | 1558 | ||
| 1561 | public bool CheckRegion(string address, uint port, bool retry) | 1559 | public bool CheckRegion(string address, uint port, bool retry) |
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index d4332b0..57d9966 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
| @@ -4481,7 +4481,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
| 4481 | public void llParticleSystem(LSL_Types.list rules) | 4481 | public void llParticleSystem(LSL_Types.list rules) |
| 4482 | { | 4482 | { |
| 4483 | m_host.AddScriptLPS(1); | 4483 | m_host.AddScriptLPS(1); |
| 4484 | if(rules.Length == 0) | 4484 | if (rules.Length == 0) |
| 4485 | { | 4485 | { |
| 4486 | m_host.RemoveParticleSystem(); | 4486 | m_host.RemoveParticleSystem(); |
| 4487 | } | 4487 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index ee10300..a33c78f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -4343,7 +4343,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 4343 | public void llParticleSystem(LSL_Types.list rules) | 4343 | public void llParticleSystem(LSL_Types.list rules) |
| 4344 | { | 4344 | { |
| 4345 | m_host.AddScriptLPS(1); | 4345 | m_host.AddScriptLPS(1); |
| 4346 | if(rules.Length == 0) | 4346 | if (rules.Length == 0) |
| 4347 | { | 4347 | { |
| 4348 | m_host.RemoveParticleSystem(); | 4348 | m_host.RemoveParticleSystem(); |
| 4349 | } | 4349 | } |