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/MetaEntity.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/MetaEntity.cs | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs index 4823bfd..5a6dbc8 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.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,8 +50,6 @@ 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 MetaEntity | 55 | public class MetaEntity |
@@ -109,7 +107,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
109 | 107 | ||
110 | #region Public Properties | 108 | #region Public Properties |
111 | 109 | ||
112 | public Dictionary<LLUUID, SceneObjectPart> Children | 110 | public Dictionary<UUID, SceneObjectPart> Children |
113 | { | 111 | { |
114 | get { return m_Entity.Children; } | 112 | get { return m_Entity.Children; } |
115 | set { m_Entity.Children = value; } | 113 | set { m_Entity.Children = value; } |
@@ -142,7 +140,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
142 | get { return m_Entity.Scene; } | 140 | get { return m_Entity.Scene; } |
143 | } | 141 | } |
144 | 142 | ||
145 | public LLUUID UUID | 143 | public UUID UUID |
146 | { | 144 | { |
147 | get { return m_Entity.UUID; } | 145 | get { return m_Entity.UUID; } |
148 | set { m_Entity.UUID = value; } | 146 | set { m_Entity.UUID = value; } |
@@ -161,7 +159,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
161 | protected void Initialize(bool physics) | 159 | protected void Initialize(bool physics) |
162 | { | 160 | { |
163 | //make new uuids | 161 | //make new uuids |
164 | Dictionary<LLUUID, SceneObjectPart> parts = new Dictionary<LLUUID, SceneObjectPart>(); | 162 | Dictionary<UUID, SceneObjectPart> parts = new Dictionary<UUID, SceneObjectPart>(); |
165 | foreach(SceneObjectPart part in m_Entity.Children.Values) | 163 | foreach(SceneObjectPart part in m_Entity.Children.Values) |
166 | { | 164 | { |
167 | part.ResetIDs(part.LinkNum); | 165 | part.ResetIDs(part.LinkNum); |
@@ -191,7 +189,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
191 | //This is important because we are not IN any database. | 189 | //This is important because we are not IN any database. |
192 | //m_Entity.FakeDeleteGroup(); | 190 | //m_Entity.FakeDeleteGroup(); |
193 | foreach( SceneObjectPart part in m_Entity.Children.Values) | 191 | foreach( SceneObjectPart part in m_Entity.Children.Values) |
194 | client.SendKillObject(m_Entity.RegionHandle, part.LocalId); | 192 | client.SendKiPrimitive(m_Entity.RegionHandle, part.LocalId); |
195 | } | 193 | } |
196 | 194 | ||
197 | /// <summary> | 195 | /// <summary> |
@@ -201,7 +199,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
201 | { | 199 | { |
202 | foreach( SceneObjectPart part in m_Entity.Children.Values) | 200 | foreach( SceneObjectPart part in m_Entity.Children.Values) |
203 | m_Entity.Scene.ClientManager.ForEachClient(delegate(IClientAPI controller) | 201 | m_Entity.Scene.ClientManager.ForEachClient(delegate(IClientAPI controller) |
204 | { controller.SendKillObject(m_Entity.RegionHandle, part.LocalId); } | 202 | { controller.SendKiPrimitive(m_Entity.RegionHandle, part.LocalId); } |
205 | ); | 203 | ); |
206 | } | 204 | } |
207 | 205 | ||
@@ -237,12 +235,12 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
237 | /// </param> | 235 | /// </param> |
238 | public static void SetPartTransparency(SceneObjectPart part, float transparencyAmount) | 236 | public static void SetPartTransparency(SceneObjectPart part, float transparencyAmount) |
239 | { | 237 | { |
240 | LLObject.TextureEntry tex = null; | 238 | Primitive.TextureEntry tex = null; |
241 | LLColor texcolor; | 239 | Color4 texcolor; |
242 | try | 240 | try |
243 | { | 241 | { |
244 | tex = part.Shape.Textures; | 242 | tex = part.Shape.Textures; |
245 | texcolor = new LLColor(); | 243 | texcolor = new Color4(); |
246 | } | 244 | } |
247 | catch(Exception) | 245 | catch(Exception) |
248 | { | 246 | { |
@@ -280,4 +278,4 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
280 | 278 | ||
281 | #endregion Public Methods | 279 | #endregion Public Methods |
282 | } | 280 | } |
283 | } \ No newline at end of file | 281 | } |