diff options
author | Robert Adams | 2013-11-15 14:56:13 -0800 |
---|---|---|
committer | Robert Adams | 2013-11-15 14:56:13 -0800 |
commit | 604b39cea908029c80aa8ee5ff3aee5c8000c0e4 (patch) | |
tree | bea875d6651531a030630e161b658c74d3aaf357 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
parent | Merge branch 'master' into varregion (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.zip opensim-SC-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.gz opensim-SC-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.bz2 opensim-SC-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.xz |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | 4 |
1 files changed, 2 insertions, 2 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 |