diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Framework/AgentCircuitManager.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/AgentCircuitManager.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/AgentCircuitManager.cs b/OpenSim/Framework/AgentCircuitManager.cs index a235688..96a7816 100644 --- a/OpenSim/Framework/AgentCircuitManager.cs +++ b/OpenSim/Framework/AgentCircuitManager.cs | |||
@@ -26,7 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using libsecondlife; | 29 | using OpenMetaverse; |
30 | 30 | ||
31 | namespace OpenSim.Framework | 31 | namespace OpenSim.Framework |
32 | { | 32 | { |
@@ -38,7 +38,7 @@ namespace OpenSim.Framework | |||
38 | { | 38 | { |
39 | } | 39 | } |
40 | 40 | ||
41 | public virtual AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitcode) | 41 | public virtual AuthenticateResponse AuthenticateSession(UUID sessionID, UUID agentID, uint circuitcode) |
42 | { | 42 | { |
43 | AgentCircuitData validcircuit = null; | 43 | AgentCircuitData validcircuit = null; |
44 | if (AgentCircuits.ContainsKey(circuitcode)) | 44 | if (AgentCircuits.ContainsKey(circuitcode)) |
@@ -86,9 +86,9 @@ namespace OpenSim.Framework | |||
86 | } | 86 | } |
87 | } | 87 | } |
88 | 88 | ||
89 | public LLVector3 GetPosition(uint circuitCode) | 89 | public Vector3 GetPosition(uint circuitCode) |
90 | { | 90 | { |
91 | LLVector3 vec = new LLVector3(); | 91 | Vector3 vec = new Vector3(); |
92 | if (AgentCircuits.ContainsKey(circuitCode)) | 92 | if (AgentCircuits.ContainsKey(circuitCode)) |
93 | { | 93 | { |
94 | vec = AgentCircuits[circuitCode].startpos; | 94 | vec = AgentCircuits[circuitCode].startpos; |