diff options
Diffstat (limited to 'OpenSim/Framework/General/AgentCircuitManager.cs')
-rw-r--r-- | OpenSim/Framework/General/AgentCircuitManager.cs | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/OpenSim/Framework/General/AgentCircuitManager.cs b/OpenSim/Framework/General/AgentCircuitManager.cs index 578cc67..3658feb 100644 --- a/OpenSim/Framework/General/AgentCircuitManager.cs +++ b/OpenSim/Framework/General/AgentCircuitManager.cs | |||
@@ -27,8 +27,6 @@ | |||
27 | */ | 27 | */ |
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using libsecondlife; | 29 | using libsecondlife; |
30 | using OpenSim.Framework.Interfaces; | ||
31 | using OpenSim.Framework; | ||
32 | 30 | ||
33 | namespace OpenSim.Framework | 31 | namespace OpenSim.Framework |
34 | { | 32 | { |
@@ -38,15 +36,14 @@ namespace OpenSim.Framework | |||
38 | 36 | ||
39 | public AgentCircuitManager() | 37 | public AgentCircuitManager() |
40 | { | 38 | { |
41 | |||
42 | } | 39 | } |
43 | 40 | ||
44 | public virtual AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitcode) | 41 | public virtual AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitcode) |
45 | { | 42 | { |
46 | AgentCircuitData validcircuit = null; | 43 | AgentCircuitData validcircuit = null; |
47 | if (this.AgentCircuits.ContainsKey(circuitcode)) | 44 | if (AgentCircuits.ContainsKey(circuitcode)) |
48 | { | 45 | { |
49 | validcircuit = this.AgentCircuits[circuitcode]; | 46 | validcircuit = AgentCircuits[circuitcode]; |
50 | } | 47 | } |
51 | AuthenticateResponse user = new AuthenticateResponse(); | 48 | AuthenticateResponse user = new AuthenticateResponse(); |
52 | if (validcircuit == null) | 49 | if (validcircuit == null) |
@@ -79,50 +76,50 @@ namespace OpenSim.Framework | |||
79 | 76 | ||
80 | public virtual void AddNewCircuit(uint circuitCode, AgentCircuitData agentData) | 77 | public virtual void AddNewCircuit(uint circuitCode, AgentCircuitData agentData) |
81 | { | 78 | { |
82 | if (this.AgentCircuits.ContainsKey(circuitCode)) | 79 | if (AgentCircuits.ContainsKey(circuitCode)) |
83 | { | 80 | { |
84 | this.AgentCircuits[circuitCode] = agentData; | 81 | AgentCircuits[circuitCode] = agentData; |
85 | } | 82 | } |
86 | else | 83 | else |
87 | { | 84 | { |
88 | this.AgentCircuits.Add(circuitCode, agentData); | 85 | AgentCircuits.Add(circuitCode, agentData); |
89 | } | 86 | } |
90 | } | 87 | } |
91 | 88 | ||
92 | public LLVector3 GetPosition(uint circuitCode) | 89 | public LLVector3 GetPosition(uint circuitCode) |
93 | { | 90 | { |
94 | LLVector3 vec = new LLVector3(); | 91 | LLVector3 vec = new LLVector3(); |
95 | if (this.AgentCircuits.ContainsKey(circuitCode)) | 92 | if (AgentCircuits.ContainsKey(circuitCode)) |
96 | { | 93 | { |
97 | vec = this.AgentCircuits[circuitCode].startpos; | 94 | vec = AgentCircuits[circuitCode].startpos; |
98 | } | 95 | } |
99 | return vec; | 96 | return vec; |
100 | } | 97 | } |
101 | 98 | ||
102 | public void UpdateAgentData(AgentCircuitData agentData) | 99 | public void UpdateAgentData(AgentCircuitData agentData) |
103 | { | 100 | { |
104 | if (this.AgentCircuits.ContainsKey((uint)agentData.circuitcode)) | 101 | if (AgentCircuits.ContainsKey((uint) agentData.circuitcode)) |
105 | { | 102 | { |
106 | this.AgentCircuits[(uint)agentData.circuitcode].firstname = agentData.firstname; | 103 | AgentCircuits[(uint) agentData.circuitcode].firstname = agentData.firstname; |
107 | this.AgentCircuits[(uint)agentData.circuitcode].lastname = agentData.lastname; | 104 | AgentCircuits[(uint) agentData.circuitcode].lastname = agentData.lastname; |
108 | this.AgentCircuits[(uint)agentData.circuitcode].startpos = agentData.startpos; | 105 | AgentCircuits[(uint) agentData.circuitcode].startpos = agentData.startpos; |
109 | // Console.WriteLine("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z); | 106 | // Console.WriteLine("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z); |
110 | } | 107 | } |
111 | } | 108 | } |
112 | 109 | ||
113 | public void UpdateAgentChildStatus(uint circuitcode, bool childstatus) | 110 | public void UpdateAgentChildStatus(uint circuitcode, bool childstatus) |
114 | { | 111 | { |
115 | if (this.AgentCircuits.ContainsKey(circuitcode)) | 112 | if (AgentCircuits.ContainsKey(circuitcode)) |
116 | { | 113 | { |
117 | this.AgentCircuits[circuitcode].child = childstatus; | 114 | AgentCircuits[circuitcode].child = childstatus; |
118 | } | 115 | } |
119 | } | 116 | } |
120 | 117 | ||
121 | public bool GetAgentChildStatus(uint circuitcode) | 118 | public bool GetAgentChildStatus(uint circuitcode) |
122 | { | 119 | { |
123 | if (this.AgentCircuits.ContainsKey(circuitcode)) | 120 | if (AgentCircuits.ContainsKey(circuitcode)) |
124 | { | 121 | { |
125 | return this.AgentCircuits[circuitcode].child; | 122 | return AgentCircuits[circuitcode].child; |
126 | } | 123 | } |
127 | return false; | 124 | return false; |
128 | } | 125 | } |