diff options
| author | Melanie | 2012-06-21 01:10:13 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-21 01:10:13 +0100 |
| commit | eab211f94d33f9c77a63344072a79cb66707c0ff (patch) | |
| tree | 4ec906bf15a6738a1a2443ccc23f83c85ef3fa0b /bin/OpenSimDefaults.ini | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Use HasPrivateAttachmentPoint properties in SOG.DeleteGroupFromScene() instea... (diff) | |
| download | opensim-SC_OLD-eab211f94d33f9c77a63344072a79cb66707c0ff.zip opensim-SC_OLD-eab211f94d33f9c77a63344072a79cb66707c0ff.tar.gz opensim-SC_OLD-eab211f94d33f9c77a63344072a79cb66707c0ff.tar.bz2 opensim-SC_OLD-eab211f94d33f9c77a63344072a79cb66707c0ff.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'bin/OpenSimDefaults.ini')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index ac8d568..6d699fd 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -1168,7 +1168,9 @@ | |||
| 1168 | ; Maximum number of llListen events we allow per script | 1168 | ; Maximum number of llListen events we allow per script |
| 1169 | ; Set this to 0 to have no limit imposed. | 1169 | ; Set this to 0 to have no limit imposed. |
| 1170 | max_listens_per_script = 64 | 1170 | max_listens_per_script = 64 |
| 1171 | 1171 | ||
| 1172 | ; Maximum number of external urls that scripts can set up in this simulator (e.g. via llRequestURL()) | ||
| 1173 | max_external_urls_per_simulator = 100 | ||
| 1172 | 1174 | ||
| 1173 | [DataSnapshot] | 1175 | [DataSnapshot] |
| 1174 | ; The following set of configs pertains to search. | 1176 | ; The following set of configs pertains to search. |