diff options
Diffstat (limited to 'OpenSim/Region/Environment/Types/UpdateQueue.cs')
-rw-r--r-- | OpenSim/Region/Environment/Types/UpdateQueue.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Types/UpdateQueue.cs b/OpenSim/Region/Environment/Types/UpdateQueue.cs index e9133ac..0c86df2 100644 --- a/OpenSim/Region/Environment/Types/UpdateQueue.cs +++ b/OpenSim/Region/Environment/Types/UpdateQueue.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Runtime.Serialization; | 30 | using System.Runtime.Serialization; |
31 | using System.Security.Permissions; | 31 | using System.Security.Permissions; |
32 | using libsecondlife; | 32 | using OpenMetaverse; |
33 | using OpenSim.Region.Environment.Scenes; | 33 | using OpenSim.Region.Environment.Scenes; |
34 | 34 | ||
35 | namespace OpenSim.Region.Environment.Types | 35 | namespace OpenSim.Region.Environment.Types |
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Types | |||
39 | { | 39 | { |
40 | private Queue<SceneObjectPart> m_queue; | 40 | private Queue<SceneObjectPart> m_queue; |
41 | 41 | ||
42 | private List<LLUUID> m_ids; | 42 | private List<UUID> m_ids; |
43 | 43 | ||
44 | private object m_syncObject = new object(); | 44 | private object m_syncObject = new object(); |
45 | 45 | ||
@@ -51,7 +51,7 @@ namespace OpenSim.Region.Environment.Types | |||
51 | public UpdateQueue() | 51 | public UpdateQueue() |
52 | { | 52 | { |
53 | m_queue = new Queue<SceneObjectPart>(); | 53 | m_queue = new Queue<SceneObjectPart>(); |
54 | m_ids = new List<LLUUID>(); | 54 | m_ids = new List<UUID>(); |
55 | } | 55 | } |
56 | 56 | ||
57 | public void Clear() | 57 | public void Clear() |
@@ -104,7 +104,7 @@ namespace OpenSim.Region.Environment.Types | |||
104 | 104 | ||
105 | foreach (Guid guid in ids_work) | 105 | foreach (Guid guid in ids_work) |
106 | { | 106 | { |
107 | m_ids.Add(new LLUUID(guid)); | 107 | m_ids.Add(new UUID(guid)); |
108 | } | 108 | } |
109 | 109 | ||
110 | //System.Console.WriteLine("UpdateQueue Deserialize END"); | 110 | //System.Console.WriteLine("UpdateQueue Deserialize END"); |
@@ -122,9 +122,9 @@ namespace OpenSim.Region.Environment.Types | |||
122 | 122 | ||
123 | List<Guid> ids_work = new List<Guid>(); | 123 | List<Guid> ids_work = new List<Guid>(); |
124 | 124 | ||
125 | foreach (LLUUID uuid in m_ids) | 125 | foreach (UUID uuid in m_ids) |
126 | { | 126 | { |
127 | ids_work.Add(uuid.UUID); | 127 | ids_work.Add(uuid.Guid); |
128 | } | 128 | } |
129 | 129 | ||
130 | info.AddValue("m_queue", m_queue); | 130 | info.AddValue("m_queue", m_queue); |