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/TeleportBehaviour.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 'OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs')
| -rw-r--r-- | OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs index 81f250d..9611d72 100644 --- a/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs +++ b/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs | |||
| @@ -43,10 +43,10 @@ namespace pCampBot | |||
| 43 | { | 43 | { |
| 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 45 | 45 | ||
| 46 | public TeleportBehaviour() | 46 | public TeleportBehaviour() |
| 47 | { | 47 | { |
| 48 | AbbreviatedName = "t"; | 48 | AbbreviatedName = "t"; |
| 49 | Name = "Teleport"; | 49 | Name = "Teleport"; |
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | public override void Action() | 52 | public override void Action() |