diff options
| author | Melanie | 2011-10-26 17:48:51 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-26 17:48:51 +0100 |
| commit | 6a96c9546d4fd89f6e9319246cc2270836cf19f7 (patch) | |
| tree | e6492419b9a03cb78435e911b345b4a31f749162 /bin | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Merge branch 'master' of /home/opensim/var/repo/opensim (diff) | |
| download | opensim-SC_OLD-6a96c9546d4fd89f6e9319246cc2270836cf19f7.zip opensim-SC_OLD-6a96c9546d4fd89f6e9319246cc2270836cf19f7.tar.gz opensim-SC_OLD-6a96c9546d4fd89f6e9319246cc2270836cf19f7.tar.bz2 opensim-SC_OLD-6a96c9546d4fd89f6e9319246cc2270836cf19f7.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'bin')
| -rwxr-xr-x[-rw-r--r--] | bin/OpenSim.ini.example | 7 | ||||
| -rw-r--r-- | bin/OpenSimDefaults.ini | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 44da31c..80f4c0e 100644..100755 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -617,6 +617,13 @@ | |||
| 617 | 617 | ||
| 618 | ; Comma separated list of UUIDS allows the function for that list of UUIDS | 618 | ; Comma separated list of UUIDS allows the function for that list of UUIDS |
| 619 | ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb | 619 | ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb |
| 620 | |||
| 621 | ; Comma separated list of owner classes that allow the function for a particular class of owners. Choices are | ||
| 622 | ; - PARCEL_GROUP_MEMBER: allow if objectgroup is the same group as the parcel | ||
| 623 | ; - PARCEL_OWNER: allow if the objectowner is parcelowner | ||
| 624 | ; - ESTATE_MANAGER: allow if the object owner is a estate manager | ||
| 625 | ; - ESTATE_OWNER: allow if objectowner is estateowner | ||
| 626 | ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb, PARCEL_OWNER, ESTATE_OWNER>, ... | ||
| 620 | 627 | ||
| 621 | ; You can also use script creators as the uuid | 628 | ; You can also use script creators as the uuid |
| 622 | ; Creators_osSetRegionWaterHeight = <uuid>, ... | 629 | ; Creators_osSetRegionWaterHeight = <uuid>, ... |
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 306c17f..de2f787 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -1196,6 +1196,13 @@ | |||
| 1196 | 1196 | ||
| 1197 | ; Comma separated list of UUIDS allows the function for that list of UUIDS | 1197 | ; Comma separated list of UUIDS allows the function for that list of UUIDS |
| 1198 | ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb | 1198 | ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb |
| 1199 | |||
| 1200 | ; Comma separated list of owner classes that allow the function for a particular class of owners. Choices are | ||
| 1201 | ; - PARCEL_GROUP_MEMBER: allow if objectgroup is the same group as the parcel | ||
| 1202 | ; - PARCEL_OWNER: allow if the objectowner is parcelowner | ||
| 1203 | ; - ESTATE_MANAGER: allow if the object owner is a estate manager | ||
| 1204 | ; - ESTATE_OWNER: allow if objectowner is estateowner | ||
| 1205 | ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb, PARCEL_OWNER, ESTATE_OWNER>, ... | ||
| 1199 | 1206 | ||
| 1200 | ; You can also use script creators as the uuid | 1207 | ; You can also use script creators as the uuid |
| 1201 | ; Creators_osSetRegionWaterHeight = <uuid>, ... | 1208 | ; Creators_osSetRegionWaterHeight = <uuid>, ... |