diff options
| author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
| commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
| tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs | |
| parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs')
| -rw-r--r-- | OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs index 1e01c64..4d806fc 100644 --- a/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs +++ b/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs | |||
| @@ -47,7 +47,11 @@ namespace pCampBot | |||
| 47 | 47 | ||
| 48 | public const int m_regionCrossingTimeout = 1000 * 60; | 48 | public const int m_regionCrossingTimeout = 1000 * 60; |
| 49 | 49 | ||
| 50 | public CrossBehaviour() { Name = "Cross"; } | 50 | public CrossBehaviour() |
| 51 | { | ||
| 52 | AbbreviatedName = "c"; | ||
| 53 | Name = "Cross"; | ||
| 54 | } | ||
| 51 | 55 | ||
| 52 | public override void Action() | 56 | public override void Action() |
| 53 | { | 57 | { |