diff options
| author | Melanie | 2013-09-07 13:54:19 +0100 |
|---|---|---|
| committer | Melanie | 2013-09-07 13:54:19 +0100 |
| commit | 2f365ea80be0df545a74da03afceb964da1546d1 (patch) | |
| tree | a54202b1cdabaa201c0566232bde69cecdcfef6a /OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-2f365ea80be0df545a74da03afceb964da1546d1.zip opensim-SC_OLD-2f365ea80be0df545a74da03afceb964da1546d1.tar.gz opensim-SC_OLD-2f365ea80be0df545a74da03afceb964da1546d1.tar.bz2 opensim-SC_OLD-2f365ea80be0df545a74da03afceb964da1546d1.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs index 9cf8a54..9a3075c 100644 --- a/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs +++ b/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs | |||
| @@ -38,6 +38,10 @@ namespace pCampBot | |||
| 38 | /// </summary> | 38 | /// </summary> |
| 39 | public class NoneBehaviour : AbstractBehaviour | 39 | public class NoneBehaviour : AbstractBehaviour |
| 40 | { | 40 | { |
| 41 | public NoneBehaviour() { Name = "None"; } | 41 | public NoneBehaviour() |
| 42 | { | ||
| 43 | AbbreviatedName = "n"; | ||
| 44 | Name = "None"; | ||
| 45 | } | ||
| 42 | } | 46 | } |
| 43 | } \ No newline at end of file | 47 | } \ No newline at end of file |