ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
This commit is contained in:
Melanie
2013-03-14 22:34:15 +00:00
parent 0e426c5cd0 a6f8638174
commit 8b657773e4
13 changed files with 353 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -141,6 +141,27 @@ namespace OpenSim.Region.Framework.Scenes
/// Dynamic attributes can be created and deleted as required.
/// </summary>
public DAMap DynAttrs { get; set; }
private DOMap m_dynObjs;
/// <summary>
/// Dynamic objects that can be created and deleted as required.
/// </summary>
public DOMap DynObjs
{
get
{
if (m_dynObjs == null)
m_dynObjs = new DOMap();
return m_dynObjs;
}
set
{
m_dynObjs = value;
}
}
/// <value>
/// Is this a root part?