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/Data/OpenSimDataReader.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/Data/OpenSimDataReader.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Data/OpenSimDataReader.cs b/OpenSim/Data/OpenSimDataReader.cs index cb613c1..f584855 100644 --- a/OpenSim/Data/OpenSimDataReader.cs +++ b/OpenSim/Data/OpenSimDataReader.cs | |||
@@ -26,7 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Data; | 28 | using System.Data; |
29 | using libsecondlife; | 29 | using OpenMetaverse; |
30 | using OpenSim.Data.Base; | 30 | using OpenSim.Data.Base; |
31 | 31 | ||
32 | namespace OpenSim.Data | 32 | namespace OpenSim.Data |
@@ -37,25 +37,25 @@ namespace OpenSim.Data | |||
37 | { | 37 | { |
38 | } | 38 | } |
39 | 39 | ||
40 | public LLVector3 GetVector(string s) | 40 | public Vector3 GetVector(string s) |
41 | { | 41 | { |
42 | float x = GetFloat(s + "X"); | 42 | float x = GetFloat(s + "X"); |
43 | float y = GetFloat(s + "Y"); | 43 | float y = GetFloat(s + "Y"); |
44 | float z = GetFloat(s + "Z"); | 44 | float z = GetFloat(s + "Z"); |
45 | 45 | ||
46 | LLVector3 vector = new LLVector3(x, y, z); | 46 | Vector3 vector = new Vector3(x, y, z); |
47 | 47 | ||
48 | return vector; | 48 | return vector; |
49 | } | 49 | } |
50 | 50 | ||
51 | public LLQuaternion GetQuaternion(string s) | 51 | public Quaternion GetQuaternion(string s) |
52 | { | 52 | { |
53 | float x = GetFloat(s + "X"); | 53 | float x = GetFloat(s + "X"); |
54 | float y = GetFloat(s + "Y"); | 54 | float y = GetFloat(s + "Y"); |
55 | float z = GetFloat(s + "Z"); | 55 | float z = GetFloat(s + "Z"); |
56 | float w = GetFloat(s + "W"); | 56 | float w = GetFloat(s + "W"); |
57 | 57 | ||
58 | LLQuaternion quaternion = new LLQuaternion(x, y, z, w); | 58 | Quaternion quaternion = new Quaternion(x, y, z, w); |
59 | 59 | ||
60 | return quaternion; | 60 | return quaternion; |
61 | } | 61 | } |