diff options
author | John Hurliman | 2010-03-03 12:12:32 -0800 |
---|---|---|
committer | John Hurliman | 2010-03-03 12:12:32 -0800 |
commit | 13a8d11c4678b5a421eb814d4253de235532de37 (patch) | |
tree | 1c3cbf35155ee0a830c7c7fe5246f5c4a6d8e8d9 /OpenSim/Framework | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-13a8d11c4678b5a421eb814d4253de235532de37.zip opensim-SC_OLD-13a8d11c4678b5a421eb814d4253de235532de37.tar.gz opensim-SC_OLD-13a8d11c4678b5a421eb814d4253de235532de37.tar.bz2 opensim-SC_OLD-13a8d11c4678b5a421eb814d4253de235532de37.tar.xz |
Removing the sLLVector3 dinosaur
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/ChildAgentDataUpdate.cs | 13 | ||||
-rw-r--r-- | OpenSim/Framework/sLLVector3.cs | 51 |
2 files changed, 6 insertions, 58 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index fee71f0..a1ac84c 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs | |||
@@ -41,14 +41,14 @@ namespace OpenSim.Framework | |||
41 | public Guid AgentID; | 41 | public Guid AgentID; |
42 | public bool alwaysrun; | 42 | public bool alwaysrun; |
43 | public float AVHeight; | 43 | public float AVHeight; |
44 | public sLLVector3 cameraPosition; | 44 | public Vector3 cameraPosition; |
45 | public float drawdistance; | 45 | public float drawdistance; |
46 | public float godlevel; | 46 | public float godlevel; |
47 | public uint GroupAccess; | 47 | public uint GroupAccess; |
48 | public sLLVector3 Position; | 48 | public Vector3 Position; |
49 | public ulong regionHandle; | 49 | public ulong regionHandle; |
50 | public byte[] throttles; | 50 | public byte[] throttles; |
51 | public sLLVector3 Velocity; | 51 | public Vector3 Velocity; |
52 | 52 | ||
53 | public ChildAgentDataUpdate() | 53 | public ChildAgentDataUpdate() |
54 | { | 54 | { |
@@ -177,14 +177,13 @@ namespace OpenSim.Framework | |||
177 | Size = new Vector3(); | 177 | Size = new Vector3(); |
178 | Size.Z = cAgent.AVHeight; | 178 | Size.Z = cAgent.AVHeight; |
179 | 179 | ||
180 | Center = new Vector3(cAgent.cameraPosition.x, cAgent.cameraPosition.y, cAgent.cameraPosition.z); | 180 | Center = cAgent.cameraPosition; |
181 | Far = cAgent.drawdistance; | 181 | Far = cAgent.drawdistance; |
182 | Position = new Vector3(cAgent.Position.x, cAgent.Position.y, cAgent.Position.z); | 182 | Position = cAgent.Position; |
183 | RegionHandle = cAgent.regionHandle; | 183 | RegionHandle = cAgent.regionHandle; |
184 | Throttles = cAgent.throttles; | 184 | Throttles = cAgent.throttles; |
185 | Velocity = new Vector3(cAgent.Velocity.x, cAgent.Velocity.y, cAgent.Velocity.z); | 185 | Velocity = cAgent.Velocity; |
186 | } | 186 | } |
187 | |||
188 | } | 187 | } |
189 | 188 | ||
190 | public class AgentGroupData | 189 | public class AgentGroupData |
diff --git a/OpenSim/Framework/sLLVector3.cs b/OpenSim/Framework/sLLVector3.cs deleted file mode 100644 index 49940c4..0000000 --- a/OpenSim/Framework/sLLVector3.cs +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using OpenMetaverse; | ||
30 | |||
31 | namespace OpenSim.Framework | ||
32 | { | ||
33 | [Serializable] | ||
34 | public class sLLVector3 | ||
35 | { | ||
36 | public float x = 0; | ||
37 | public float y = 0; | ||
38 | public float z = 0; | ||
39 | |||
40 | public sLLVector3() | ||
41 | { | ||
42 | } | ||
43 | |||
44 | public sLLVector3(Vector3 v) | ||
45 | { | ||
46 | x = v.X; | ||
47 | y = v.Y; | ||
48 | z = v.Z; | ||
49 | } | ||
50 | } | ||
51 | } \ No newline at end of file | ||