diff options
| author | Justin Clark-Casey (justincc) | 2012-02-09 01:17:59 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-02-09 01:17:59 +0000 |
| commit | 9c84a8162f700fc2eb35018389c12fcfedc02587 (patch) | |
| tree | 663c57d6ed5a4eb071fbd7e1ab69315dcb34c067 /OpenSim/Region/Framework | |
| parent | Add NPC torture tests for 100, 1000 and 2000 create and delete NPC calls. (diff) | |
| download | opensim-SC_OLD-9c84a8162f700fc2eb35018389c12fcfedc02587.zip opensim-SC_OLD-9c84a8162f700fc2eb35018389c12fcfedc02587.tar.gz opensim-SC_OLD-9c84a8162f700fc2eb35018389c12fcfedc02587.tar.bz2 opensim-SC_OLD-9c84a8162f700fc2eb35018389c12fcfedc02587.tar.xz | |
If NPCModule.CreateNPC() fails to create the required ScenePresence (which should in theory never happen), don't add the NPC to the npc list but return UUID.Zero instead.
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/INPCModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/INPCModule.cs b/OpenSim/Region/Framework/Interfaces/INPCModule.cs index 2731291..dc3ff89 100644 --- a/OpenSim/Region/Framework/Interfaces/INPCModule.cs +++ b/OpenSim/Region/Framework/Interfaces/INPCModule.cs | |||
| @@ -58,7 +58,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 58 | /// </param> | 58 | /// </param> |
| 59 | /// <param name="scene"></param> | 59 | /// <param name="scene"></param> |
| 60 | /// <param name="appearance">The avatar appearance to use for the new NPC.</param> | 60 | /// <param name="appearance">The avatar appearance to use for the new NPC.</param> |
| 61 | /// <returns>The UUID of the ScenePresence created.</returns> | 61 | /// <returns>The UUID of the ScenePresence created. UUID.Zero if there was a failure.</returns> |
| 62 | UUID CreateNPC( | 62 | UUID CreateNPC( |
| 63 | string firstname, | 63 | string firstname, |
| 64 | string lastname, | 64 | string lastname, |