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/PrimitiveBaseShapeTableMapper.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/PrimitiveBaseShapeTableMapper.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs b/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs index a4e39a1..5a6b3db 100644 --- a/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs +++ b/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs | |||
@@ -26,7 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using libsecondlife; | 29 | using OpenMetaverse; |
30 | using OpenSim.Data.Base; | 30 | using OpenSim.Data.Base; |
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | 32 | ||
@@ -89,9 +89,9 @@ namespace OpenSim.Data | |||
89 | delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.ProfileEnd; }, | 89 | delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.ProfileEnd; }, |
90 | delegate(PrimitiveBaseShapeRowMapper shape, ushort value) { shape.Object.ProfileEnd = value; }); | 90 | delegate(PrimitiveBaseShapeRowMapper shape, ushort value) { shape.Object.ProfileEnd = value; }); |
91 | 91 | ||
92 | rowMapperSchema.AddMapping<LLVector3>("Scale", | 92 | rowMapperSchema.AddMapping<Vector3>("Scale", |
93 | delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.Scale; }, | 93 | delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.Scale; }, |
94 | delegate(PrimitiveBaseShapeRowMapper shape, LLVector3 value) { shape.Object.Scale = value; }); | 94 | delegate(PrimitiveBaseShapeRowMapper shape, Vector3 value) { shape.Object.Scale = value; }); |
95 | 95 | ||
96 | rowMapperSchema.AddMapping<sbyte>("PathTaperX", | 96 | rowMapperSchema.AddMapping<sbyte>("PathTaperX", |
97 | delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.PathTaperX; }, | 97 | delegate(PrimitiveBaseShapeRowMapper shape) { return shape.Object.PathTaperX; }, |
@@ -143,7 +143,7 @@ namespace OpenSim.Data | |||
143 | PrimitiveBaseShape shape = new PrimitiveBaseShape(); | 143 | PrimitiveBaseShape shape = new PrimitiveBaseShape(); |
144 | 144 | ||
145 | PrimitiveBaseShapeRowMapper mapper = new PrimitiveBaseShapeRowMapper(m_schema, shape); | 145 | PrimitiveBaseShapeRowMapper mapper = new PrimitiveBaseShapeRowMapper(m_schema, shape); |
146 | mapper.FillObject(reader); | 146 | mapper.FiPrimitive(reader); |
147 | 147 | ||
148 | return mapper; | 148 | return mapper; |
149 | } | 149 | } |