diff options
| author | John Hurliman | 2009-10-19 15:19:37 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-10-19 15:19:37 -0700 |
| commit | bd03cbd8156e2044eed89ba2774bab43b9931aa1 (patch) | |
| tree | c6dc15d4028b2d103b89296ac68b84482b77f5e8 /OpenSim/Region/Framework | |
| parent | * Change Util.FireAndForget to use ThreadPool.UnsafeQueueUserWorkItem(). This... (diff) | |
| parent | Minor formatting cleanup. (diff) | |
| download | opensim-SC_OLD-bd03cbd8156e2044eed89ba2774bab43b9931aa1.zip opensim-SC_OLD-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.gz opensim-SC_OLD-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.bz2 opensim-SC_OLD-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 4f3cc98..2dbc090 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1152,13 +1152,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1152 | 1152 | ||
| 1153 | public void AddGroupTarget(SceneObjectGroup grp) | 1153 | public void AddGroupTarget(SceneObjectGroup grp) |
| 1154 | { | 1154 | { |
| 1155 | lock(m_groupsWithTargets) | 1155 | lock (m_groupsWithTargets) |
| 1156 | m_groupsWithTargets[grp.UUID] = grp; | 1156 | m_groupsWithTargets[grp.UUID] = grp; |
| 1157 | } | 1157 | } |
| 1158 | 1158 | ||
| 1159 | public void RemoveGroupTarget(SceneObjectGroup grp) | 1159 | public void RemoveGroupTarget(SceneObjectGroup grp) |
| 1160 | { | 1160 | { |
| 1161 | lock(m_groupsWithTargets) | 1161 | lock (m_groupsWithTargets) |
| 1162 | m_groupsWithTargets.Remove(grp.UUID); | 1162 | m_groupsWithTargets.Remove(grp.UUID); |
| 1163 | } | 1163 | } |
| 1164 | 1164 | ||