diff options
author | Justin Clark-Casey (justincc) | 2012-03-29 01:26:30 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-29 01:26:30 +0100 |
commit | 22a85b947a16074525343a56203211806ce16834 (patch) | |
tree | 0ce05c1edf757ed7d0d611bbdefe79816b6d65dc /OpenSim/Region/ClientStack | |
parent | Change namespace on CallingCardModule and correct interface file placemant. A... (diff) | |
download | opensim-SC_OLD-22a85b947a16074525343a56203211806ce16834.zip opensim-SC_OLD-22a85b947a16074525343a56203211806ce16834.tar.gz opensim-SC_OLD-22a85b947a16074525343a56203211806ce16834.tar.bz2 opensim-SC_OLD-22a85b947a16074525343a56203211806ce16834.tar.xz |
Add back parts of reverted changes that were not concerned with child agent caching.
This adds ScenePresence to IClientAPI.SceneAgent earlier on in the add client process so that its information is available to EventManager.OnNewClient() and OnClientLogin()
Also add a code comment as to why we're caching friend information for child agents.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-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 cd81df5..9899669 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -384,7 +384,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
384 | set { m_startpos = value; } | 384 | set { m_startpos = value; } |
385 | } | 385 | } |
386 | public UUID AgentId { get { return m_agentId; } } | 386 | public UUID AgentId { get { return m_agentId; } } |
387 | public ISceneAgent SceneAgent { get; private set; } | 387 | public ISceneAgent SceneAgent { get; set; } |
388 | public UUID ActiveGroupId { get { return m_activeGroupID; } } | 388 | public UUID ActiveGroupId { get { return m_activeGroupID; } } |
389 | public string ActiveGroupName { get { return m_activeGroupName; } } | 389 | public string ActiveGroupName { get { return m_activeGroupName; } } |
390 | public ulong ActiveGroupPowers { get { return m_activeGroupPowers; } } | 390 | public ulong ActiveGroupPowers { get { return m_activeGroupPowers; } } |
@@ -695,7 +695,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
695 | 695 | ||
696 | public virtual void Start() | 696 | public virtual void Start() |
697 | { | 697 | { |
698 | SceneAgent = m_scene.AddNewClient(this, PresenceType.User); | 698 | m_scene.AddNewClient(this, PresenceType.User); |
699 | 699 | ||
700 | RefreshGroupMembership(); | 700 | RefreshGroupMembership(); |
701 | } | 701 | } |