diff options
| author | Melanie | 2018-09-12 13:22:17 +0100 |
|---|---|---|
| committer | Melanie | 2018-09-12 13:22:17 +0100 |
| commit | e874e3a2ad47af6a045dbe3f4dd91364cd92750a (patch) | |
| tree | a92dc21f85d01e421842cb2fbfa4ecdf3430334a /OpenSim/Tools | |
| parent | Squelch "connection reset by peer" exceptions (diff) | |
| parent | oooops (diff) | |
| download | opensim-SC-e874e3a2ad47af6a045dbe3f4dd91364cd92750a.zip opensim-SC-e874e3a2ad47af6a045dbe3f4dd91364cd92750a.tar.gz opensim-SC-e874e3a2ad47af6a045dbe3f4dd91364cd92750a.tar.bz2 opensim-SC-e874e3a2ad47af6a045dbe3f4dd91364cd92750a.tar.xz | |
Merge branch 'master' of opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Tools')
| -rw-r--r-- | OpenSim/Tools/pCampBot/BotManager.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs index 37dc0d9..60e6ce3 100644 --- a/OpenSim/Tools/pCampBot/BotManager.cs +++ b/OpenSim/Tools/pCampBot/BotManager.cs | |||
| @@ -302,7 +302,7 @@ namespace pCampBot | |||
| 302 | { | 302 | { |
| 303 | lock (m_bots) | 303 | lock (m_bots) |
| 304 | { | 304 | { |
| 305 | string lastName = string.Format("{0}_{1}", m_lastNameStem, i + m_fromBotNumber); | 305 | string lastName = string.Format("{0}{1}", m_lastNameStem, i + m_fromBotNumber); |
| 306 | 306 | ||
| 307 | CreateBot( | 307 | CreateBot( |
| 308 | this, | 308 | this, |
| @@ -958,7 +958,7 @@ namespace pCampBot | |||
| 958 | 958 | ||
| 959 | private string GenerateBotNameFromNumber(int botNumber) | 959 | private string GenerateBotNameFromNumber(int botNumber) |
| 960 | { | 960 | { |
| 961 | return string.Format("{0} {1}_{2}", m_firstName, m_lastNameStem, botNumber); | 961 | return string.Format("{0} {1}{2}", m_firstName, m_lastNameStem, botNumber); |
| 962 | } | 962 | } |
| 963 | 963 | ||
| 964 | internal void Grid_GridRegion(object o, GridRegionEventArgs args) | 964 | internal void Grid_GridRegion(object o, GridRegionEventArgs args) |