aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorteravus2013-03-14 00:58:00 -0400
committerteravus2013-03-14 00:58:00 -0400
commit9fad90a914eca234ec35fcfe115a212b603bfb52 (patch)
tree83580aba3ad8c7424be79956603cbccd2380d651 /OpenSim/Region/Framework
parent* Updates HttpServer again to re-add the code that closes the stream and conn... (diff)
parentImprove DAExampleModule to show current necessary locking to avoid race condi... (diff)
downloadopensim-SC_OLD-9fad90a914eca234ec35fcfe115a212b603bfb52.zip
opensim-SC_OLD-9fad90a914eca234ec35fcfe115a212b603bfb52.tar.gz
opensim-SC_OLD-9fad90a914eca234ec35fcfe115a212b603bfb52.tar.bz2
opensim-SC_OLD-9fad90a914eca234ec35fcfe115a212b603bfb52.tar.xz
Merge branch 'master' of ssh://opensim/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs21
1 files changed, 21 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 3e9a6fa..a8b63fe 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?