diff options
author | BlueWall | 2012-09-11 22:58:21 -0400 |
---|---|---|
committer | BlueWall | 2012-09-11 22:58:21 -0400 |
commit | e9322b0bf714251719919db8638bf92f19289190 (patch) | |
tree | 4eca77cc71f4428e57f0a4c176189e114bfb9397 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | Fix prebuild.xml format for reference (diff) | |
parent | minor: Comment out friends notification log spam for now. (diff) | |
download | opensim-SC-e9322b0bf714251719919db8638bf92f19289190.zip opensim-SC-e9322b0bf714251719919db8638bf92f19289190.tar.gz opensim-SC-e9322b0bf714251719919db8638bf92f19289190.tar.bz2 opensim-SC-e9322b0bf714251719919db8638bf92f19289190.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index e528288..ac26be7 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2022,13 +2022,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
2022 | m_scene.m_linksetCapacity) | 2022 | m_scene.m_linksetCapacity) |
2023 | { | 2023 | { |
2024 | m_log.DebugFormat( | 2024 | m_log.DebugFormat( |
2025 | "[SCENE OBJECT GROUP]: Cannot link group with root" + | 2025 | "[SCENE OBJECT GROUP]: Cannot link group with root" + |
2026 | " part {0}, {1} ({2} prims) to group with root part" + | 2026 | " part {0}, {1} ({2} prims) to group with root part" + |
2027 | " {3}, {4} ({5} prims) because the new linkset" + | 2027 | " {3}, {4} ({5} prims) because the new linkset" + |
2028 | " would exceed the configured maximum of {6}", | 2028 | " would exceed the configured maximum of {6}", |
2029 | objectGroup.RootPart.Name, objectGroup.RootPart.UUID, | 2029 | objectGroup.RootPart.Name, objectGroup.RootPart.UUID, |
2030 | objectGroup.PrimCount, RootPart.Name, RootPart.UUID, | 2030 | objectGroup.PrimCount, RootPart.Name, RootPart.UUID, |
2031 | PrimCount, m_scene.m_linksetCapacity); | 2031 | PrimCount, m_scene.m_linksetCapacity); |
2032 | |||
2032 | return; | 2033 | return; |
2033 | } | 2034 | } |
2034 | 2035 | ||