ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'melanie'

Browse Source
This commit is contained in:
Melanie Thielker
2017-03-31 14:50:14 +01:00
parent 9a01fddd1c 6463ab7d79
commit 5587ee4500
22 changed files with 12271 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@@ -376,6 +376,8 @@ namespace OpenSim.Region.Framework.Scenes
public bool m_dupeInProgress = false;
internal Dictionary<UUID, string> m_savedScriptState;
public UUID MonitoringObject { get; set; }
#region Properties
/// <summary>