diff options
author | Teravus Ovares | 2008-09-06 22:28:51 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 22:28:51 +0000 |
commit | 3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe (patch) | |
tree | 78f306a05c126927d06936cd87ef9e6e0a1cdaf7 /OpenSim/Framework | |
parent | Mantis#1234. Thank you HomerHorwitz for a patch that: (diff) | |
download | opensim-SC_OLD-3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe.zip opensim-SC_OLD-3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe.tar.gz opensim-SC_OLD-3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe.tar.bz2 opensim-SC_OLD-3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe.tar.xz |
* This changes gridcomms types back to our home grown wholy controlled types.
* These are different types then the OMV types because changing them causes just about all grid comms to break. If these were the libOMV types, then libOMV couldn't change them ever again after that.. or we'd have a breakage whenever they changed them.
* This might introduce a map issue. Still checking it out.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/ChildAgentDataUpdate.cs | 8 | ||||
-rw-r--r-- | OpenSim/Framework/sLLVector3.cs | 51 |
2 files changed, 55 insertions, 4 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index ef40d94..0515aeb 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs | |||
@@ -26,7 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using OpenMetaverse; | 29 | using OpenSim.Framework; |
30 | 30 | ||
31 | namespace OpenSim.Framework | 31 | namespace OpenSim.Framework |
32 | { | 32 | { |
@@ -37,14 +37,14 @@ namespace OpenSim.Framework | |||
37 | public Guid AgentID; | 37 | public Guid AgentID; |
38 | public bool alwaysrun; | 38 | public bool alwaysrun; |
39 | public float AVHeight; | 39 | public float AVHeight; |
40 | public Vector3 cameraPosition; | 40 | public sLLVector3 cameraPosition; |
41 | public float drawdistance; | 41 | public float drawdistance; |
42 | public float godlevel; | 42 | public float godlevel; |
43 | public uint GroupAccess; | 43 | public uint GroupAccess; |
44 | public Vector3 Position; | 44 | public sLLVector3 Position; |
45 | public ulong regionHandle; | 45 | public ulong regionHandle; |
46 | public byte[] throttles; | 46 | public byte[] throttles; |
47 | public Vector3 Velocity; | 47 | public sLLVector3 Velocity; |
48 | 48 | ||
49 | public ChildAgentDataUpdate() | 49 | public ChildAgentDataUpdate() |
50 | { | 50 | { |
diff --git a/OpenSim/Framework/sLLVector3.cs b/OpenSim/Framework/sLLVector3.cs index e69de29..b93661b 100644 --- a/OpenSim/Framework/sLLVector3.cs +++ b/OpenSim/Framework/sLLVector3.cs | |||
@@ -0,0 +1,51 @@ | |||
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 OpenSim 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 | ||