diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs index 2aca93a..d6fb15b 100644 --- a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs +++ b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs | |||
@@ -76,7 +76,7 @@ namespace OpenSim.Region.Framework.DynamicAttributes.DAExampleModule | |||
76 | protected bool OnSceneGroupMove(UUID groupId, Vector3 delta) | 76 | protected bool OnSceneGroupMove(UUID groupId, Vector3 delta) |
77 | { | 77 | { |
78 | SceneObjectPart sop = m_scene.GetSceneObjectPart(groupId); | 78 | SceneObjectPart sop = m_scene.GetSceneObjectPart(groupId); |
79 | OSDMap attrs = sop.DynAttrs; | 79 | DAMap attrs = sop.DynAttrs; |
80 | 80 | ||
81 | lock (attrs) | 81 | lock (attrs) |
82 | { | 82 | { |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 2a9b99e..27f3a4d 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -128,7 +128,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
128 | /// <summary> | 128 | /// <summary> |
129 | /// Dynamic attributes can be created and deleted as required. | 129 | /// Dynamic attributes can be created and deleted as required. |
130 | /// </summary> | 130 | /// </summary> |
131 | public DynAttrsOSDMap DynAttrs { get; set; } | 131 | public DAMap DynAttrs { get; set; } |
132 | 132 | ||
133 | /// <value> | 133 | /// <value> |
134 | /// Is this a root part? | 134 | /// Is this a root part? |
@@ -341,7 +341,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
341 | m_particleSystem = Utils.EmptyBytes; | 341 | m_particleSystem = Utils.EmptyBytes; |
342 | Rezzed = DateTime.UtcNow; | 342 | Rezzed = DateTime.UtcNow; |
343 | Description = String.Empty; | 343 | Description = String.Empty; |
344 | DynAttrs = new DynAttrsOSDMap(); | 344 | DynAttrs = new DAMap(); |
345 | 345 | ||
346 | // Prims currently only contain a single folder (Contents). From looking at the Second Life protocol, | 346 | // Prims currently only contain a single folder (Contents). From looking at the Second Life protocol, |
347 | // this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from | 347 | // this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from |