diff options
| author | Melanie | 2012-03-29 00:27:35 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-29 00:27:35 +0100 |
| commit | 7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f (patch) | |
| tree | b09be52d5e7838b7c187c92f08f6c2bc73741a42 /OpenSim/Region/OptionalModules/World | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add comment about setting client.SceneAgent in AddNewClient() (diff) | |
| download | opensim-SC_OLD-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.zip opensim-SC_OLD-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.tar.gz opensim-SC_OLD-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.tar.bz2 opensim-SC_OLD-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index a2375fe..c3335f0 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -72,7 +72,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 72 | get { return m_ownerID; } | 72 | get { return m_ownerID; } |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | public ISceneAgent SceneAgent { get { throw new NotImplementedException(); } } | 75 | public ISceneAgent SceneAgent { get; set; } |
| 76 | 76 | ||
| 77 | public void Say(string message) | 77 | public void Say(string message) |
| 78 | { | 78 | { |