diff options
| author | Melanie | 2012-01-27 23:30:26 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-27 23:30:26 +0000 |
| commit | 26a4e8a16170edf8fb55b10ba2e6febd7c6a588f (patch) | |
| tree | a6f66c622d890f5cfaee0cf49e1a8a0938ffe641 /OpenSim/Region/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Increment LPS script stat for OSSL functions that were not already doing this (diff) | |
| download | opensim-SC_OLD-26a4e8a16170edf8fb55b10ba2e6febd7c6a588f.zip opensim-SC_OLD-26a4e8a16170edf8fb55b10ba2e6febd7c6a588f.tar.gz opensim-SC_OLD-26a4e8a16170edf8fb55b10ba2e6febd7c6a588f.tar.bz2 opensim-SC_OLD-26a4e8a16170edf8fb55b10ba2e6febd7c6a588f.tar.xz | |
Merge branch 'master' into careminster
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 c50e734..b428c40 100644 --- a/OpenSim/Region/Framework/Interfaces/INPCModule.cs +++ b/OpenSim/Region/Framework/Interfaces/INPCModule.cs | |||
| @@ -134,4 +134,4 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 134 | /// <returns>UUID of owner if the NPC exists, UUID.Zero if there was no such agent, the agent is unowned or the agent was not an NPC</returns> | 134 | /// <returns>UUID of owner if the NPC exists, UUID.Zero if there was no such agent, the agent is unowned or the agent was not an NPC</returns> |
| 135 | UUID GetOwner(UUID agentID); | 135 | UUID GetOwner(UUID agentID); |
| 136 | } | 136 | } |
| 137 | } | 137 | } \ No newline at end of file |