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/ClientStack/Linden | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Add comment about setting client.SceneAgent in AddNewClient() (diff) | |
download | opensim-SC-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.zip opensim-SC-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.tar.gz opensim-SC-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.tar.bz2 opensim-SC-7dad1ded2e969d50dd7a1bce9a219fb8ba6c760f.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index d0920d2..54fc7f4 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -396,7 +396,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
396 | } | 396 | } |
397 | } | 397 | } |
398 | public UUID AgentId { get { return m_agentId; } } | 398 | public UUID AgentId { get { return m_agentId; } } |
399 | public ISceneAgent SceneAgent { get; private set; } | 399 | public ISceneAgent SceneAgent { get; set; } |
400 | public UUID ActiveGroupId { get { return m_activeGroupID; } } | 400 | public UUID ActiveGroupId { get { return m_activeGroupID; } } |
401 | public string ActiveGroupName { get { return m_activeGroupName; } } | 401 | public string ActiveGroupName { get { return m_activeGroupName; } } |
402 | public ulong ActiveGroupPowers { get { return m_activeGroupPowers; } } | 402 | public ulong ActiveGroupPowers { get { return m_activeGroupPowers; } } |
@@ -719,7 +719,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
719 | 719 | ||
720 | public virtual void Start() | 720 | public virtual void Start() |
721 | { | 721 | { |
722 | SceneAgent = m_scene.AddNewClient(this, PresenceType.User); | 722 | m_scene.AddNewClient(this, PresenceType.User); |
723 | 723 | ||
724 | RefreshGroupMembership(); | 724 | RefreshGroupMembership(); |
725 | } | 725 | } |