diff options
| author | Melanie | 2012-03-03 09:58:57 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-03 09:58:57 +0000 |
| commit | 1f32730798c7633bbed47736a1b302dcd13ce903 (patch) | |
| tree | 2456fc1135e91e56e0d17d9fbe67f147b7f5fda2 /OpenSim/Tools/pCampBot/BotManager.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove outdated comment about checking attachment prims in Scene.PipeEventsFo... (diff) | |
| download | opensim-SC-1f32730798c7633bbed47736a1b302dcd13ce903.zip opensim-SC-1f32730798c7633bbed47736a1b302dcd13ce903.tar.gz opensim-SC-1f32730798c7633bbed47736a1b302dcd13ce903.tar.bz2 opensim-SC-1f32730798c7633bbed47736a1b302dcd13ce903.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Tools/pCampBot/BotManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs index 6481e97..0f501b7 100644 --- a/OpenSim/Tools/pCampBot/BotManager.cs +++ b/OpenSim/Tools/pCampBot/BotManager.cs | |||
| @@ -266,7 +266,7 @@ namespace pCampBot | |||
| 266 | /// <returns></returns> | 266 | /// <returns></returns> |
| 267 | protected CommandConsole CreateConsole() | 267 | protected CommandConsole CreateConsole() |
| 268 | { | 268 | { |
| 269 | return new LocalConsole("Region"); | 269 | return new LocalConsole("pCampbot"); |
| 270 | } | 270 | } |
| 271 | 271 | ||
| 272 | private void HandleShutdown(string module, string[] cmd) | 272 | private void HandleShutdown(string module, string[] cmd) |