diff options
author | Melanie | 2012-09-16 04:11:20 +0100 |
---|---|---|
committer | Melanie | 2012-09-16 04:11:20 +0100 |
commit | db774d4292588db1e2ac4a9fafe977ddbec353ee (patch) | |
tree | 5fc381d7cb96cc0d2b47e4807821f488c339ec13 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.zip opensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.gz opensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.bz2 opensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
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 18e74c1..f1df6d6 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2750,13 +2750,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
2750 | m_scene.m_linksetCapacity) | 2750 | m_scene.m_linksetCapacity) |
2751 | { | 2751 | { |
2752 | m_log.DebugFormat( | 2752 | m_log.DebugFormat( |
2753 | "[SCENE OBJECT GROUP]: Cannot link group with root" + | 2753 | "[SCENE OBJECT GROUP]: Cannot link group with root" + |
2754 | " part {0}, {1} ({2} prims) to group with root part" + | 2754 | " part {0}, {1} ({2} prims) to group with root part" + |
2755 | " {3}, {4} ({5} prims) because the new linkset" + | 2755 | " {3}, {4} ({5} prims) because the new linkset" + |
2756 | " would exceed the configured maximum of {6}", | 2756 | " would exceed the configured maximum of {6}", |
2757 | objectGroup.RootPart.Name, objectGroup.RootPart.UUID, | 2757 | objectGroup.RootPart.Name, objectGroup.RootPart.UUID, |
2758 | objectGroup.PrimCount, RootPart.Name, RootPart.UUID, | 2758 | objectGroup.PrimCount, RootPart.Name, RootPart.UUID, |
2759 | PrimCount, m_scene.m_linksetCapacity); | 2759 | PrimCount, m_scene.m_linksetCapacity); |
2760 | |||
2760 | return; | 2761 | return; |
2761 | } | 2762 | } |
2762 | 2763 | ||