OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix indentation and issues where tabs were used instead of spaces in commit 783ee949

connector_plugin
Justin Clark-Casey (justincc) 2012-09-12 01:45:34 +01:00
parent c17965eec4
commit ebb394bbda
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -2022,13 +2022,14 @@ namespace OpenSim.Region.Framework.Scenes
m_scene.m_linksetCapacity) m_scene.m_linksetCapacity)
{ {
m_log.DebugFormat( m_log.DebugFormat(
"[SCENE OBJECT GROUP]: Cannot link group with root" + "[SCENE OBJECT GROUP]: Cannot link group with root" +
" part {0}, {1} ({2} prims) to group with root part" + " part {0}, {1} ({2} prims) to group with root part" +
" {3}, {4} ({5} prims) because the new linkset" + " {3}, {4} ({5} prims) because the new linkset" +
" would exceed the configured maximum of {6}", " would exceed the configured maximum of {6}",
objectGroup.RootPart.Name, objectGroup.RootPart.UUID, objectGroup.RootPart.Name, objectGroup.RootPart.UUID,
objectGroup.PrimCount, RootPart.Name, RootPart.UUID, objectGroup.PrimCount, RootPart.Name, RootPart.UUID,
PrimCount, m_scene.m_linksetCapacity); PrimCount, m_scene.m_linksetCapacity);
return; return;
} }

8
bin/OpenSim.ini.example
View File

@ -108,10 +108,10 @@
;; This can be overriden in the region config file. ;; This can be overriden in the region config file.
; ClampPrimSize = false ; ClampPrimSize = false
;# {LinksetPrims} {} {Max prims an object will hold?} {} 0 ;# {LinksetPrims} {} {Max prims an object will hold?} {} 0
;; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero. ;; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero.
;; This can be overriden in the region config file. ;; This can be overriden in the region config file.
; LinksetPrims = 0 ; LinksetPrims = 0
;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} true ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} true
;; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region. ;; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region.

6
bin/OpenSimDefaults.ini
View File

@ -95,9 +95,9 @@
; This can be overriden in the region config file. ; This can be overriden in the region config file.
ClampPrimSize = false ClampPrimSize = false
; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero. ; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero.
; This can be overriden in the region config file. ; This can be overriden in the region config file.
LinksetPrims = 0 LinksetPrims = 0
; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region. ; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region.
; This only applies when crossing to a region running in a different simulator. ; This only applies when crossing to a region running in a different simulator.