diff options
| author | Melanie | 2012-02-10 10:20:51 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-10 10:20:51 +0000 |
| commit | 215acbcc9667077fc665be6d5f81c66cf989891e (patch) | |
| tree | 291a607c6fd648b3488d6cc8f05a84ff4f134446 /OpenSim/Region/Framework/Interfaces/INPCModule.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix: Unable to remove AV from friend list (sqldb-bug) http://opensimulator.or... (diff) | |
| download | opensim-SC-215acbcc9667077fc665be6d5f81c66cf989891e.zip opensim-SC-215acbcc9667077fc665be6d5f81c66cf989891e.tar.gz opensim-SC-215acbcc9667077fc665be6d5f81c66cf989891e.tar.bz2 opensim-SC-215acbcc9667077fc665be6d5f81c66cf989891e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
Diffstat (limited to '')
| -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, |