Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Justin Clark-Casey (justincc) 2014-03-11 23:39:07 +0000
committer: Justin Clark-Casey (justincc) 2014-03-11 23:39:07 +0000
commit: 86630a1b70bc2d1c51bf9753e17030c584fb9aa6 (patch)
tree: a5870dbc8fa6242c6a5017d45fc1b49cc5c9a0c2 /bin
parent: Instead of auto-creating a parcel on request if one doesn't cover a given loc... (diff)
parent: varregion: remove serialization of region terrain to floats when sending patc... (diff)
download: opensim-SC_OLD-86630a1b70bc2d1c51bf9753e17030c584fb9aa6.zip
opensim-SC_OLD-86630a1b70bc2d1c51bf9753e17030c584fb9aa6.tar.gz
opensim-SC_OLD-86630a1b70bc2d1c51bf9753e17030c584fb9aa6.tar.bz2
opensim-SC_OLD-86630a1b70bc2d1c51bf9753e17030c584fb9aa6.tar.xz
3 files changed, 5 insertions, 5 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index e3b91ae..c4697a1 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -113,15 +113,15 @@
    ;; NonPhysicalPrimMax!).
    ; NonPhysicalPrimMax = 256
-    ;# {PhysicalPrimMin} {} {Minimum size of physical prims?} {} 10
+    ;# {PhysicalPrimMin} {} {Minimum size of physical prims?} {} 0.01
    ;; Maximum size where a prim can be physical.  Affects resizing of
    ;; existing prims.  This can be overriden in the region config file.
    ; PhysicalPrimMin = 0.01
-    ;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 10
+    ;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 64
    ;; Maximum size where a prim can be physical.  Affects resizing of
    ;; existing prims.  This can be overriden in the region config file.
-    ; PhysicalPrimMax = 10
+    ; PhysicalPrimMax = 64
    ;# {ClampPrimSize} {} {Clamp viewer rezzed prims to max sizes?} {true false} false
    ;; If a viewer attempts to rez a prim larger than the non-physical or
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 026f285..f59dbf2 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -97,7 +97,7 @@
    NonPhysicalPrimMax = 256
    ; Maximum size of physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file.
-    PhysicalPrimMax = 10
+    PhysicalPrimMax = 64
    ; If a viewer attempts to rez a prim larger than the non-physical or physical prim max, clamp the dimensions to the appropriate maximum
    ; This can be overriden in the region config file.
diff --git a/bin/Regions/Regions.ini.example b/bin/Regions/Regions.ini.example
index ab3a62a..aabc4f8 100644
--- a/bin/Regions/Regions.ini.example
+++ b/bin/Regions/Regions.ini.example
@@ -29,7 +29,7 @@ ExternalHostName = "SYSTEMIP"
 ; *
 ; NonphysicalPrimMax = 256
-; PhysicalPrimMax = 10
+; PhysicalPrimMax = 64
 ; ClampPrimSize = False
 ; MaxPrims = 15000
 ; MaxAgents = 100
author	Justin Clark-Casey (justincc)	2014-03-11 23:39:07 +0000
committer	Justin Clark-Casey (justincc)	2014-03-11 23:39:07 +0000
commit	86630a1b70bc2d1c51bf9753e17030c584fb9aa6 (patch)
tree	a5870dbc8fa6242c6a5017d45fc1b49cc5c9a0c2 /bin
parent	Instead of auto-creating a parcel on request if one doesn't cover a given loc... (diff)
parent	varregion: remove serialization of region terrain to floats when sending patc... (diff)
download	opensim-SC_OLD-86630a1b70bc2d1c51bf9753e17030c584fb9aa6.zip opensim-SC_OLD-86630a1b70bc2d1c51bf9753e17030c584fb9aa6.tar.gz opensim-SC_OLD-86630a1b70bc2d1c51bf9753e17030c584fb9aa6.tar.bz2 opensim-SC_OLD-86630a1b70bc2d1c51bf9753e17030c584fb9aa6.tar.xz

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index e3b91ae..c4697a1 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example
@@ -113,15 +113,15 @@
113	;; NonPhysicalPrimMax!).	113	;; NonPhysicalPrimMax!).
114	; NonPhysicalPrimMax = 256	114	; NonPhysicalPrimMax = 256
115		115
116	;# {PhysicalPrimMin} {} {Minimum size of physical prims?} {} 10	116	;# {PhysicalPrimMin} {} {Minimum size of physical prims?} {} 0.01
117	;; Maximum size where a prim can be physical. Affects resizing of	117	;; Maximum size where a prim can be physical. Affects resizing of
118	;; existing prims. This can be overriden in the region config file.	118	;; existing prims. This can be overriden in the region config file.
119	; PhysicalPrimMin = 0.01	119	; PhysicalPrimMin = 0.01
120		120
121	;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 10	121	;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 64
122	;; Maximum size where a prim can be physical. Affects resizing of	122	;; Maximum size where a prim can be physical. Affects resizing of
123	;; existing prims. This can be overriden in the region config file.	123	;; existing prims. This can be overriden in the region config file.
124	; PhysicalPrimMax = 10	124	; PhysicalPrimMax = 64
125		125
126	;# {ClampPrimSize} {} {Clamp viewer rezzed prims to max sizes?} {true false} false	126	;# {ClampPrimSize} {} {Clamp viewer rezzed prims to max sizes?} {true false} false
127	;; If a viewer attempts to rez a prim larger than the non-physical or	127	;; If a viewer attempts to rez a prim larger than the non-physical or


diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 026f285..f59dbf2 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini
@@ -97,7 +97,7 @@
97	NonPhysicalPrimMax = 256	97	NonPhysicalPrimMax = 256
98		98
99	; Maximum size of physical prims. Affects resizing of existing prims. This can be overriden in the region config file.	99	; Maximum size of physical prims. Affects resizing of existing prims. This can be overriden in the region config file.
100	PhysicalPrimMax = 10	100	PhysicalPrimMax = 64
101		101
102	; If a viewer attempts to rez a prim larger than the non-physical or physical prim max, clamp the dimensions to the appropriate maximum	102	; If a viewer attempts to rez a prim larger than the non-physical or physical prim max, clamp the dimensions to the appropriate maximum
103	; This can be overriden in the region config file.	103	; This can be overriden in the region config file.


diff --git a/bin/Regions/Regions.ini.example b/bin/Regions/Regions.ini.example index ab3a62a..aabc4f8 100644 --- a/bin/Regions/Regions.ini.example +++ b/bin/Regions/Regions.ini.example
@@ -29,7 +29,7 @@ ExternalHostName = "SYSTEMIP"
29	; *	29	; *
30		30
31	; NonphysicalPrimMax = 256	31	; NonphysicalPrimMax = 256
32	; PhysicalPrimMax = 10	32	; PhysicalPrimMax = 64
33	; ClampPrimSize = False	33	; ClampPrimSize = False
34	; MaxPrims = 15000	34	; MaxPrims = 15000
35	; MaxAgents = 100	35	; MaxAgents = 100