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 | |
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')
-rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 655f3a5..a37e997 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
55 | 55 | ||
56 | private UUID m_agentID = UUID.Random(); | 56 | private UUID m_agentID = UUID.Random(); |
57 | 57 | ||
58 | public ISceneAgent SceneAgent { get; private set; } | 58 | public ISceneAgent SceneAgent { get; set; } |
59 | 59 | ||
60 | private string m_username; | 60 | private string m_username; |
61 | private string m_nick; | 61 | private string m_nick; |
@@ -903,7 +903,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
903 | 903 | ||
904 | public void Start() | 904 | public void Start() |
905 | { | 905 | { |
906 | SceneAgent = m_scene.AddNewClient(this, PresenceType.User); | 906 | m_scene.AddNewClient(this, PresenceType.User); |
907 | 907 | ||
908 | // Mimicking LLClientView which gets always set appearance from client. | 908 | // Mimicking LLClientView which gets always set appearance from client. |
909 | AvatarAppearance appearance; | 909 | AvatarAppearance appearance; |
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 | { |