diff options
| author | UbitUmarov | 2016-08-19 03:05:25 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-08-19 03:05:25 +0100 |
| commit | 7ba3fb7b5d9c883b7a99d19f893ff6d43689b629 (patch) | |
| tree | 1ea4937e30520d440979ab02e92882f6f54a3e73 /bin | |
| parent | fix entity update flags update (diff) | |
| parent | catch some NULL refs (diff) | |
| download | opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.zip opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.tar.gz opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.tar.bz2 opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.tar.xz | |
merge issue
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 3 | ||||
| -rw-r--r-- | bin/config-include/osslEnable.ini | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index df92921..6ccea99 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -725,7 +725,8 @@ | |||
| 725 | Cap_GetObjectCost = "" | 725 | Cap_GetObjectCost = "" |
| 726 | Cap_GetObjectPhysicsData = "" | 726 | Cap_GetObjectPhysicsData = "" |
| 727 | Cap_GroupProposalBallot = "" | 727 | Cap_GroupProposalBallot = "" |
| 728 | Cap_HomeLocation = "" | 728 | Cap_GroupMemberData = "localhost" |
| 729 | Cap_HomeLocation = "localhost" | ||
| 729 | Cap_LandResources = "" | 730 | Cap_LandResources = "" |
| 730 | Cap_MapLayer = "localhost" | 731 | Cap_MapLayer = "localhost" |
| 731 | Cap_MapLayerGod = "localhost" | 732 | Cap_MapLayerGod = "localhost" |
diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini index c87539f..4c6be16 100644 --- a/bin/config-include/osslEnable.ini +++ b/bin/config-include/osslEnable.ini | |||
| @@ -213,6 +213,7 @@ | |||
| 213 | ; Some of these were added as early functionality for NPCs. This has been replaced with the NPC functions. | 213 | ; Some of these were added as early functionality for NPCs. This has been replaced with the NPC functions. |
| 214 | Allow_osAvatarPlayAnimation = false | 214 | Allow_osAvatarPlayAnimation = false |
| 215 | Allow_osAvatarStopAnimation = false | 215 | Allow_osAvatarStopAnimation = false |
| 216 | Allow_osForceAttachToOtherAvatarFromInventory = false | ||
| 216 | Allow_osForceDetachFromAvatar = false | 217 | Allow_osForceDetachFromAvatar = false |
| 217 | Allow_osForceOtherSit = false | 218 | Allow_osForceOtherSit = false |
| 218 | ; The notecard functions can cause a lot of load on the region if over used | 219 | ; The notecard functions can cause a lot of load on the region if over used |
| @@ -225,7 +226,6 @@ | |||
| 225 | 226 | ||
| 226 | ; ThreatLevel Severe | 227 | ; ThreatLevel Severe |
| 227 | Allow_osConsoleCommand = false | 228 | Allow_osConsoleCommand = false |
| 228 | Allow_osForceAttachToOtherAvatarFromInventory = false | ||
| 229 | Allow_osGrantScriptPermissions = false | 229 | Allow_osGrantScriptPermissions = false |
| 230 | Allow_osKickAvatar = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER | 230 | Allow_osKickAvatar = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER |
| 231 | Allow_osRevokeScriptPermissions = false | 231 | Allow_osRevokeScriptPermissions = false |