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/CMEntityCollection.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/CMEntityCollection.cs | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs index 454429c..996badf 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs | |||
@@ -40,7 +40,7 @@ using System.Collections; | |||
40 | using System.Collections.Generic; | 40 | using System.Collections.Generic; |
41 | using System.Threading; | 41 | using System.Threading; |
42 | 42 | ||
43 | using libsecondlife; | 43 | using OpenMetaverse; |
44 | 44 | ||
45 | using Nini.Config; | 45 | using Nini.Config; |
46 | 46 | ||
@@ -52,8 +52,6 @@ using OpenSim.Region.Physics.Manager; | |||
52 | 52 | ||
53 | using log4net; | 53 | using log4net; |
54 | 54 | ||
55 | using Axiom.Math; | ||
56 | |||
57 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 55 | namespace OpenSim.Region.Environment.Modules.ContentManagement |
58 | { | 56 | { |
59 | public class CMEntityCollection | 57 | public class CMEntityCollection |
@@ -63,12 +61,12 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
63 | // private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 61 | // private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
64 | // Any ContentManagementEntities that represent old versions of current SceneObjectGroups or | 62 | // Any ContentManagementEntities that represent old versions of current SceneObjectGroups or |
65 | // old versions of deleted SceneObjectGroups will be stored in this hash table. | 63 | // old versions of deleted SceneObjectGroups will be stored in this hash table. |
66 | // The LLUUID keys are from the SceneObjectGroup RootPart UUIDs | 64 | // The UUID keys are from the SceneObjectGroup RootPart UUIDs |
67 | protected Hashtable m_CMEntityHash = Hashtable.Synchronized(new Hashtable()); //LLUUID to ContentManagementEntity | 65 | protected Hashtable m_CMEntityHash = Hashtable.Synchronized(new Hashtable()); //UUID to ContentManagementEntity |
68 | 66 | ||
69 | // SceneObjectParts that have not been revisioned will be given green auras stored in this hashtable | 67 | // SceneObjectParts that have not been revisioned will be given green auras stored in this hashtable |
70 | // The LLUUID keys are from the SceneObjectPart that they are supposed to be on. | 68 | // The UUID keys are from the SceneObjectPart that they are supposed to be on. |
71 | protected Hashtable m_NewlyCreatedEntityAura = Hashtable.Synchronized(new Hashtable()); //LLUUID to AuraMetaEntity | 69 | protected Hashtable m_NewlyCreatedEntityAura = Hashtable.Synchronized(new Hashtable()); //UUID to AuraMetaEntity |
72 | 70 | ||
73 | #endregion Fields | 71 | #endregion Fields |
74 | 72 | ||
@@ -151,7 +149,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
151 | part.ParentGroup.Scene.PrimIDAllocate(), | 149 | part.ParentGroup.Scene.PrimIDAllocate(), |
152 | part.GetWorldPosition(), | 150 | part.GetWorldPosition(), |
153 | MetaEntity.TRANSLUCENT, | 151 | MetaEntity.TRANSLUCENT, |
154 | new LLVector3(0,254,0), | 152 | new Vector3(0,254,0), |
155 | part.Scale | 153 | part.Scale |
156 | ); | 154 | ); |
157 | m_NewlyCreatedEntityAura.Add(part.UUID, ent); | 155 | m_NewlyCreatedEntityAura.Add(part.UUID, ent); |
@@ -175,7 +173,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
175 | return ent; | 173 | return ent; |
176 | } | 174 | } |
177 | 175 | ||
178 | public bool RemoveEntity(LLUUID uuid) | 176 | public bool RemoveEntity(UUID uuid) |
179 | { | 177 | { |
180 | if (!m_CMEntityHash.ContainsKey(uuid)) | 178 | if (!m_CMEntityHash.ContainsKey(uuid)) |
181 | return false; | 179 | return false; |
@@ -183,7 +181,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
183 | return true; | 181 | return true; |
184 | } | 182 | } |
185 | 183 | ||
186 | public bool RemoveNewlyCreatedEntityAura(LLUUID uuid) | 184 | public bool RemoveNewlyCreatedEntityAura(UUID uuid) |
187 | { | 185 | { |
188 | if (!m_NewlyCreatedEntityAura.ContainsKey(uuid)) | 186 | if (!m_NewlyCreatedEntityAura.ContainsKey(uuid)) |
189 | return false; | 187 | return false; |
@@ -193,4 +191,4 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
193 | 191 | ||
194 | #endregion Public Methods | 192 | #endregion Public Methods |
195 | } | 193 | } |
196 | } \ No newline at end of file | 194 | } |