aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-03-13 22:59:06 +0000
committerJustin Clark-Casey (justincc)2013-03-13 22:59:06 +0000
commit5c53660a7f055be9ed41f30893de673acac8a0f1 (patch)
tree3c3568c6ab1caf1df975ef7ceaa15cd332dc69a1 /OpenSim/Region/Framework/Scenes
parentminor: save some commented out log lines which will be useful again in future... (diff)
downloadopensim-SC-5c53660a7f055be9ed41f30893de673acac8a0f1.zip
opensim-SC-5c53660a7f055be9ed41f30893de673acac8a0f1.tar.gz
opensim-SC-5c53660a7f055be9ed41f30893de673acac8a0f1.tar.bz2
opensim-SC-5c53660a7f055be9ed41f30893de673acac8a0f1.tar.xz
Add prototype dynamic objects map for scene object parts
This allows region modules to add dynamic objects to SOPs rather than having to continually push and pull OSD dynamic attributes. This is to explore the original MOAP use case for dynamic attributes where it could be very awkward and possibly time-consuming to keep reconstructing MediaEntrys from stored DynamicAttributes. This commit adds a DOExampleModule to demonstrate/evolve this code. Dynamic objects involve no storage or persistence changes - the 'backing store' for any data that does need to be saved will remain the DAMap. DOExampleModule in this commit only attaches a fresh dynamic object. Actually constructing this from stored dynamic attributes and handling persistence is left for later. These changes should affect no existing functionality, though it may or may not reveal necessary changes in DAMap down the road.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs22
1 files changed, 22 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 3e9a6fa..ee7c4f4 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -129,6 +129,27 @@ namespace OpenSim.Region.Framework.Scenes
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 DAMap DynAttrs { get; set; } 131 public DAMap DynAttrs { get; set; }
132
133 private DOMap m_dynObjs;
134
135 /// <summary>
136 /// Dynamic objects that can be created and deleted as required.
137 /// </summary>
138 public DOMap DynObjs
139 {
140 get
141 {
142 if (m_dynObjs == null)
143 m_dynObjs = new DOMap();
144
145 return m_dynObjs;
146 }
147
148 set
149 {
150 m_dynObjs = value;
151 }
152 }
132 153
133 /// <value> 154 /// <value>
134 /// Is this a root part? 155 /// Is this a root part?
@@ -348,6 +369,7 @@ namespace OpenSim.Region.Framework.Scenes
348 Rezzed = DateTime.UtcNow; 369 Rezzed = DateTime.UtcNow;
349 Description = String.Empty; 370 Description = String.Empty;
350 DynAttrs = new DAMap(); 371 DynAttrs = new DAMap();
372 DynObjs = new DOMap();
351 373
352 // Prims currently only contain a single folder (Contents). From looking at the Second Life protocol, 374 // Prims currently only contain a single folder (Contents). From looking at the Second Life protocol,
353 // this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from 375 // this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from