diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs index 59f6244..b27ece8 100644 --- a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs +++ b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs | |||
| @@ -42,10 +42,10 @@ namespace pCampBot | |||
| 42 | /// </remarks> | 42 | /// </remarks> |
| 43 | public class GrabbingBehaviour : AbstractBehaviour | 43 | public class GrabbingBehaviour : AbstractBehaviour |
| 44 | { | 44 | { |
| 45 | public GrabbingBehaviour() | 45 | public GrabbingBehaviour() |
| 46 | { | 46 | { |
| 47 | AbbreviatedName = "g"; | 47 | AbbreviatedName = "g"; |
| 48 | Name = "Grabbing"; | 48 | Name = "Grabbing"; |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | public override void Action() | 51 | public override void Action() |