diff options
author | Justin Clark-Casey (justincc) | 2013-11-15 21:45:08 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-11-15 21:45:08 +0000 |
commit | 7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9 (patch) | |
tree | 24a0c3d086944436431ccae6302cd7cc0ffa8407 /OpenSim/Region/ScriptEngine/Shared | |
parent | If a local land ID is given to the "land show" command, then output to consol... (diff) | |
download | opensim-SC-7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9.zip opensim-SC-7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9.tar.gz opensim-SC-7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9.tar.bz2 opensim-SC-7cab41f4223b7febd3fdd42fa7cfefef25e4a9c9.tar.xz |
refactor: replace verbose checks with String.IsNullOrEmpty where applicable.
Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs index 6e74227..64dc2e2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | |||
@@ -367,7 +367,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
367 | 367 | ||
368 | Vector3 ZeroVector = new Vector3(0, 0, 0); | 368 | Vector3 ZeroVector = new Vector3(0, 0, 0); |
369 | 369 | ||
370 | bool nameSearch = (ts.name != null && ts.name != ""); | 370 | bool nameSearch = !string.IsNullOrEmpty(ts.name); |
371 | 371 | ||
372 | foreach (EntityBase ent in Entities) | 372 | foreach (EntityBase ent in Entities) |
373 | { | 373 | { |
@@ -605,7 +605,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
605 | return sensedEntities; | 605 | return sensedEntities; |
606 | senseEntity(sp); | 606 | senseEntity(sp); |
607 | } | 607 | } |
608 | else if (ts.name != null && ts.name != "") | 608 | else if (!string.IsNullOrEmpty(ts.name)) |
609 | { | 609 | { |
610 | ScenePresence sp; | 610 | ScenePresence sp; |
611 | // Try lookup by name will return if/when found | 611 | // Try lookup by name will return if/when found |
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 87f7189..a1b8d85 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | |||
@@ -618,7 +618,7 @@ namespace SecondLife | |||
618 | // error log. | 618 | // error log. |
619 | if (results.Errors.Count > 0) | 619 | if (results.Errors.Count > 0) |
620 | { | 620 | { |
621 | if (!retried && (results.Errors[0].FileName == null || results.Errors[0].FileName == String.Empty) && | 621 | if (!retried && string.IsNullOrEmpty(results.Errors[0].FileName) && |
622 | results.Errors[0].Line == 0) | 622 | results.Errors[0].Line == 0) |
623 | { | 623 | { |
624 | // System.Console.WriteLine("retrying failed compilation"); | 624 | // System.Console.WriteLine("retrying failed compilation"); |