diff options
| author | Melanie Thielker | 2017-03-31 14:50:14 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2017-03-31 14:50:14 +0100 |
| commit | 5587ee45005bd99ee01cefd8fb3ae3f2b91bf284 (patch) | |
| tree | 2863324dc4f7832d60c22118268b8a432fb7c1bf /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | add CanSellObject() permitions check functions (diff) | |
| parent | If a DNS resolution fails on an outbound request, simply allow it (diff) | |
| download | opensim-SC_OLD-5587ee45005bd99ee01cefd8fb3ae3f2b91bf284.zip opensim-SC_OLD-5587ee45005bd99ee01cefd8fb3ae3f2b91bf284.tar.gz opensim-SC_OLD-5587ee45005bd99ee01cefd8fb3ae3f2b91bf284.tar.bz2 opensim-SC_OLD-5587ee45005bd99ee01cefd8fb3ae3f2b91bf284.tar.xz | |
Merge branch 'melanie'
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 45196bb..bf4d60c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -376,6 +376,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 376 | public bool m_dupeInProgress = false; | 376 | public bool m_dupeInProgress = false; |
| 377 | internal Dictionary<UUID, string> m_savedScriptState; | 377 | internal Dictionary<UUID, string> m_savedScriptState; |
| 378 | 378 | ||
| 379 | public UUID MonitoringObject { get; set; } | ||
| 380 | |||
| 379 | #region Properties | 381 | #region Properties |
| 380 | 382 | ||
| 381 | /// <summary> | 383 | /// <summary> |