diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 15 | ||||
-rw-r--r-- | bin/OpenSim.ini.example | 8 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 6 |
3 files changed, 15 insertions, 14 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 | ||
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index f0ebcce..0de4002 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -108,10 +108,10 @@ | |||
108 | ;; This can be overriden in the region config file. | 108 | ;; This can be overriden in the region config file. |
109 | ; ClampPrimSize = false | 109 | ; ClampPrimSize = false |
110 | 110 | ||
111 | ;# {LinksetPrims} {} {Max prims an object will hold?} {} 0 | 111 | ;# {LinksetPrims} {} {Max prims an object will hold?} {} 0 |
112 | ;; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero. | 112 | ;; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero. |
113 | ;; This can be overriden in the region config file. | 113 | ;; This can be overriden in the region config file. |
114 | ; LinksetPrims = 0 | 114 | ; LinksetPrims = 0 |
115 | 115 | ||
116 | ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} true | 116 | ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} true |
117 | ;; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region. | 117 | ;; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region. |
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index c080fbf..0173f5b 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -95,9 +95,9 @@ | |||
95 | ; This can be overriden in the region config file. | 95 | ; This can be overriden in the region config file. |
96 | ClampPrimSize = false | 96 | ClampPrimSize = false |
97 | 97 | ||
98 | ; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero. | 98 | ; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero. |
99 | ; This can be overriden in the region config file. | 99 | ; This can be overriden in the region config file. |
100 | LinksetPrims = 0 | 100 | LinksetPrims = 0 |
101 | 101 | ||
102 | ; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region. | 102 | ; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region. |
103 | ; This only applies when crossing to a region running in a different simulator. | 103 | ; This only applies when crossing to a region running in a different simulator. |