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/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-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/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs index cafc2bf..b0c6955 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs | |||
@@ -39,7 +39,7 @@ using System; | |||
39 | using System.Collections.Generic; | 39 | using System.Collections.Generic; |
40 | using System.Drawing; | 40 | using System.Drawing; |
41 | 41 | ||
42 | using libsecondlife; | 42 | using OpenMetaverse; |
43 | 43 | ||
44 | using Nini.Config; | 44 | using Nini.Config; |
45 | 45 | ||
@@ -50,22 +50,20 @@ using OpenSim.Region.Physics.Manager; | |||
50 | 50 | ||
51 | using log4net; | 51 | using log4net; |
52 | 52 | ||
53 | using Axiom.Math; | ||
54 | |||
55 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 53 | namespace OpenSim.Region.Environment.Modules.ContentManagement |
56 | { | 54 | { |
57 | public class PointMetaEntity : MetaEntity | 55 | public class PointMetaEntity : MetaEntity |
58 | { | 56 | { |
59 | #region Constructors | 57 | #region Constructors |
60 | 58 | ||
61 | public PointMetaEntity(Scene scene, uint LocalId, LLVector3 groupPos, float transparency) | 59 | public PointMetaEntity(Scene scene, uint LocalId, Vector3 groupPos, float transparency) |
62 | : base() | 60 | : base() |
63 | { | 61 | { |
64 | CreatePointEntity(scene, LLUUID.Random(), LocalId, groupPos); | 62 | CreatePointEntity(scene, UUID.Random(), LocalId, groupPos); |
65 | SetPartTransparency(m_Entity.RootPart, transparency); | 63 | SetPartTransparency(m_Entity.RootPart, transparency); |
66 | } | 64 | } |
67 | 65 | ||
68 | public PointMetaEntity(Scene scene, LLUUID uuid, uint LocalId, LLVector3 groupPos, float transparency) | 66 | public PointMetaEntity(Scene scene, UUID uuid, uint LocalId, Vector3 groupPos, float transparency) |
69 | : base() | 67 | : base() |
70 | { | 68 | { |
71 | CreatePointEntity(scene, uuid, LocalId, groupPos); | 69 | CreatePointEntity(scene, uuid, LocalId, groupPos); |
@@ -76,7 +74,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
76 | 74 | ||
77 | #region Private Methods | 75 | #region Private Methods |
78 | 76 | ||
79 | private void CreatePointEntity(Scene scene, LLUUID uuid, uint LocalId, LLVector3 groupPos) | 77 | private void CreatePointEntity(Scene scene, UUID uuid, uint LocalId, Vector3 groupPos) |
80 | { | 78 | { |
81 | SceneObjectGroup x = new SceneObjectGroup(); | 79 | SceneObjectGroup x = new SceneObjectGroup(); |
82 | SceneObjectPart y = new SceneObjectPart(); | 80 | SceneObjectPart y = new SceneObjectPart(); |
@@ -85,23 +83,23 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
85 | y.Name = "Very Small Point"; | 83 | y.Name = "Very Small Point"; |
86 | y.RegionHandle = scene.RegionInfo.RegionHandle; | 84 | y.RegionHandle = scene.RegionInfo.RegionHandle; |
87 | y.CreationDate = (Int32) (DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; | 85 | y.CreationDate = (Int32) (DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; |
88 | y.OwnerID = LLUUID.Zero; | 86 | y.OwnerID = UUID.Zero; |
89 | y.CreatorID = LLUUID.Zero; | 87 | y.CreatorID = UUID.Zero; |
90 | y.LastOwnerID = LLUUID.Zero; | 88 | y.LastOwnerID = UUID.Zero; |
91 | y.UUID = uuid; | 89 | y.UUID = uuid; |
92 | 90 | ||
93 | y.LocalId = LocalId; | 91 | y.LocalId = LocalId; |
94 | 92 | ||
95 | y.Shape = PrimitiveBaseShape.CreateBox(); | 93 | y.Shape = PrimitiveBaseShape.CreateBox(); |
96 | y.Scale = new LLVector3(0.01f,0.01f,0.01f); | 94 | y.Scale = new Vector3(0.01f,0.01f,0.01f); |
97 | y.LastOwnerID = LLUUID.Zero; | 95 | y.LastOwnerID = UUID.Zero; |
98 | y.GroupPosition = groupPos; | 96 | y.GroupPosition = groupPos; |
99 | y.OffsetPosition = new LLVector3(0, 0, 0); | 97 | y.OffsetPosition = new Vector3(0, 0, 0); |
100 | y.RotationOffset = new LLQuaternion(0,0,0,0); | 98 | y.RotationOffset = new Quaternion(0,0,0,0); |
101 | y.Velocity = new LLVector3(0, 0, 0); | 99 | y.Velocity = new Vector3(0, 0, 0); |
102 | y.RotationalVelocity = new LLVector3(0, 0, 0); | 100 | y.RotationalVelocity = new Vector3(0, 0, 0); |
103 | y.AngularVelocity = new LLVector3(0, 0, 0); | 101 | y.AngularVelocity = new Vector3(0, 0, 0); |
104 | y.Acceleration = new LLVector3(0, 0, 0); | 102 | y.Acceleration = new Vector3(0, 0, 0); |
105 | 103 | ||
106 | y.Flags = 0; | 104 | y.Flags = 0; |
107 | y.TrimPermissions(); | 105 | y.TrimPermissions(); |
@@ -121,4 +119,4 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
121 | 119 | ||
122 | #endregion Private Methods | 120 | #endregion Private Methods |
123 | } | 121 | } |
124 | } \ No newline at end of file | 122 | } |