diff options
| author | Melanie | 2012-06-09 16:28:22 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-09 16:28:22 +0100 |
| commit | 8c91e761c8ab0f327ab710cf9b0581e42c20374b (patch) | |
| tree | b9e133efe376878064c12b83a4e6d5eef62ceb4e /bin/OpenSimDefaults.ini | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Create avatar entries necessary to stop new v3 avatars being clouds (pants, s... (diff) | |
| download | opensim-SC_OLD-8c91e761c8ab0f327ab710cf9b0581e42c20374b.zip opensim-SC_OLD-8c91e761c8ab0f327ab710cf9b0581e42c20374b.tar.gz opensim-SC_OLD-8c91e761c8ab0f327ab710cf9b0581e42c20374b.tar.bz2 opensim-SC_OLD-8c91e761c8ab0f327ab710cf9b0581e42c20374b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
Diffstat (limited to 'bin/OpenSimDefaults.ini')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 9afac3f..58e9b10 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -1153,6 +1153,8 @@ | |||
| 1153 | ; currently unused | 1153 | ; currently unused |
| 1154 | ; AllowosConsoleCommand=false | 1154 | ; AllowosConsoleCommand=false |
| 1155 | 1155 | ||
| 1156 | ; Are god functions such as llSetObjectPermMask() allowed? If true then gods and only gods have access to these functions. | ||
| 1157 | ; If false then gods cannot execute these functions either. | ||
| 1156 | AllowGodFunctions = false | 1158 | AllowGodFunctions = false |
| 1157 | 1159 | ||
| 1158 | ; Maximum number of llListen events we allow over the entire region. | 1160 | ; Maximum number of llListen events we allow over the entire region. |