aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini
diff options
context:
space:
mode:
authorDiva Canto2012-03-27 14:25:36 -0700
committerDiva Canto2012-03-27 14:25:36 -0700
commit5e073366727b48b6467dd55c819016e450c8598c (patch)
tree29699e1e5dee4a415b19c1bae07202c08be9497f /bin/OpenSimDefaults.ini
parentAmend to previous commit regarding the config name. Bugs bite. (diff)
parentTwo new scripting functions osInviteToGroup(userID) and osEjectFromGroup(user... (diff)
downloadopensim-SC_OLD-5e073366727b48b6467dd55c819016e450c8598c.zip
opensim-SC_OLD-5e073366727b48b6467dd55c819016e450c8598c.tar.gz
opensim-SC_OLD-5e073366727b48b6467dd55c819016e450c8598c.tar.bz2
opensim-SC_OLD-5e073366727b48b6467dd55c819016e450c8598c.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin/OpenSimDefaults.ini')
-rw-r--r--bin/OpenSimDefaults.ini12
1 files changed, 12 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 28c5587..45d604f 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -272,6 +272,8 @@
272 ; Disabled by default 272 ; Disabled by default
273 ; simple_build_permissions = False 273 ; simple_build_permissions = False
274 274
275 ; Minimum user level required to upload assets
276 ;LevelUpload = 0
275 277
276 ; ## 278 ; ##
277 ; ## SCRIPT ENGINE 279 ; ## SCRIPT ENGINE
@@ -620,6 +622,10 @@
620 ; This is set to 4095 because current viewers can't handle teleports that are greater than this distance 622 ; This is set to 4095 because current viewers can't handle teleports that are greater than this distance
621 max_distance = 4095 623 max_distance = 4095
622 624
625 ; Minimum user level required for HyperGrid teleports
626 LevelHGTeleport = 0
627
628
623[Messaging] 629[Messaging]
624 ; Control which region module is used for instant messaging. 630 ; Control which region module is used for instant messaging.
625 ; Default is InstantMessageModule (this is the name of the core IM module as well as the setting) 631 ; Default is InstantMessageModule (this is the name of the core IM module as well as the setting)
@@ -657,6 +663,9 @@
657 ; mesh, and use it for collisions. 663 ; mesh, and use it for collisions.
658 UseMeshiesPhysicsMesh = true 664 UseMeshiesPhysicsMesh = true
659 665
666 ; Minimum user level required to upload meshes
667 ;LevelUpload = 0
668
660 669
661[ODEPhysicsSettings] 670[ODEPhysicsSettings]
662 ;## 671 ;##
@@ -1497,6 +1506,9 @@
1497 ; System.Net.WebException: The request was aborted: The request was canceled. 1506 ; System.Net.WebException: The request was aborted: The request was canceled.
1498 ; XmlRpcDisableKeepAlive = false 1507 ; XmlRpcDisableKeepAlive = false
1499 1508
1509 ; Minimum user level required to create groups
1510 ;LevelGroupCreate = 0
1511
1500 1512
1501[PacketPool] 1513[PacketPool]
1502 ; Enables the experimental packet pool. Yes, we've been here before. 1514 ; Enables the experimental packet pool. Yes, we've been here before.