diff options
author | Justin Clark-Casey (justincc) | 2013-09-27 22:27:39 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-09-27 22:27:39 +0100 |
commit | 2cd95fac736cc99b1a2ad661e4a03810225ffaca (patch) | |
tree | 537c60270f8b3ce02950ca3486c064f77e38822b /OpenSim/Region/ClientStack | |
parent | refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make ... (diff) | |
download | opensim-SC_OLD-2cd95fac736cc99b1a2ad661e4a03810225ffaca.zip opensim-SC_OLD-2cd95fac736cc99b1a2ad661e4a03810225ffaca.tar.gz opensim-SC_OLD-2cd95fac736cc99b1a2ad661e4a03810225ffaca.tar.bz2 opensim-SC_OLD-2cd95fac736cc99b1a2ad661e4a03810225ffaca.tar.xz |
refactor: Rename Scene.AddNewClient() to AddNewAgent() to make it obvious in the code that this is symmetric with CloseAgent()
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 3609ec1..6b58fb7 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -750,7 +750,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
750 | 750 | ||
751 | public virtual void Start() | 751 | public virtual void Start() |
752 | { | 752 | { |
753 | m_scene.AddNewClient(this, PresenceType.User); | 753 | m_scene.AddNewAgent(this, PresenceType.User); |
754 | 754 | ||
755 | RefreshGroupMembership(); | 755 | RefreshGroupMembership(); |
756 | } | 756 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 5296a6d..8d957dc 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -1718,7 +1718,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1718 | else if (client.SceneAgent == null) | 1718 | else if (client.SceneAgent == null) |
1719 | { | 1719 | { |
1720 | // This check exists to catch a condition where the new client has been added to the client | 1720 | // This check exists to catch a condition where the new client has been added to the client |
1721 | // manager but the SceneAgent has not yet been set in Scene.AddNewClient(). If we are too | 1721 | // manager but the SceneAgent has not yet been set in Scene.AddNewAgent(). If we are too |
1722 | // eager, then the new ScenePresence may not have registered a listener for this messsage | 1722 | // eager, then the new ScenePresence may not have registered a listener for this messsage |
1723 | // before we try to process it. | 1723 | // before we try to process it. |
1724 | // XXX: A better long term fix may be to add the SceneAgent before the client is added to | 1724 | // XXX: A better long term fix may be to add the SceneAgent before the client is added to |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs index 28b5eb7..e2178e5 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs | |||
@@ -52,7 +52,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
52 | public override void Update(int frames) {} | 52 | public override void Update(int frames) {} |
53 | public override void LoadWorldMap() {} | 53 | public override void LoadWorldMap() {} |
54 | 54 | ||
55 | public override ISceneAgent AddNewClient(IClientAPI client, PresenceType type) | 55 | public override ISceneAgent AddNewAgent(IClientAPI client, PresenceType type) |
56 | { | 56 | { |
57 | client.OnObjectName += RecordObjectNameCall; | 57 | client.OnObjectName += RecordObjectNameCall; |
58 | 58 | ||
@@ -61,6 +61,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
61 | } | 61 | } |
62 | 62 | ||
63 | public override bool CloseAgent(UUID agentID, bool force) { return true; } | 63 | public override bool CloseAgent(UUID agentID, bool force) { return true; } |
64 | |||
64 | public override bool CheckClient(UUID clientId, IPEndPoint endPoint) { return true; } | 65 | public override bool CheckClient(UUID clientId, IPEndPoint endPoint) { return true; } |
65 | 66 | ||
66 | public override void OtherRegionUp(GridRegion otherRegion) { } | 67 | public override void OtherRegionUp(GridRegion otherRegion) { } |