diff options
| author | Melanie | 2012-02-05 20:58:04 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-05 20:58:04 +0000 |
| commit | 54fc78013d1eb946551656849e7007427ef4aec3 (patch) | |
| tree | fae81b9031f5ae0fb07d0f3e61eb83946bbc26b1 /bin/OpenSimDefaults.ini | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Revert my two quick fixes for the lag issue and put in the real fix, which (diff) | |
| download | opensim-SC_OLD-54fc78013d1eb946551656849e7007427ef4aec3.zip opensim-SC_OLD-54fc78013d1eb946551656849e7007427ef4aec3.tar.gz opensim-SC_OLD-54fc78013d1eb946551656849e7007427ef4aec3.tar.bz2 opensim-SC_OLD-54fc78013d1eb946551656849e7007427ef4aec3.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'bin/OpenSimDefaults.ini')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 3b39f7f..6e6e4eb 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -82,7 +82,7 @@ | |||
| 82 | allow_regionless = false | 82 | allow_regionless = false |
| 83 | 83 | ||
| 84 | ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!). | 84 | ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!). |
| 85 | NonPhysicalPrimMax = 256 | 85 | NonphysicalPrimMax = 256 |
| 86 | 86 | ||
| 87 | ; Maximum size of physical prims. Affects resizing of existing prims. This can be overriden in the region config file. | 87 | ; Maximum size of physical prims. Affects resizing of existing prims. This can be overriden in the region config file. |
| 88 | PhysicalPrimMax = 10 | 88 | PhysicalPrimMax = 10 |