diff options
| author | Melanie | 2013-03-05 23:57:53 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-05 23:57:53 +0000 |
| commit | 81552f41c601017f43061d923eba393b9f85a7b3 (patch) | |
| tree | 5d6c3aba0f72941c06b47eaae6f4cd0301b60b23 /OpenSim/Region/OptionalModules/Avatar | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | minor: Fix mono compiler warning in MonitorModule (diff) | |
| download | opensim-SC-81552f41c601017f43061d923eba393b9f85a7b3.zip opensim-SC-81552f41c601017f43061d923eba393b9f85a7b3.tar.gz opensim-SC-81552f41c601017f43061d923eba393b9f85a7b3.tar.bz2 opensim-SC-81552f41c601017f43061d923eba393b9f85a7b3.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs index 17971e3..e9ddbbe 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs | |||
| @@ -76,7 +76,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments | |||
| 76 | 76 | ||
| 77 | if (m_console != null) | 77 | if (m_console != null) |
| 78 | { | 78 | { |
| 79 | m_console.AddCommand("TempAttachModule", false, "set auto_grant_attach_perms", "set auto_grant_attach_perms true|false", "Allow objects owned by the region owner os estate managers to obtain attach permissions without asking the user", SetAutoGrantAttachPerms); | 79 | m_console.AddCommand("TempAttachModule", false, "set auto_grant_attach_perms", "set auto_grant_attach_perms true|false", "Allow objects owned by the region owner or estate managers to obtain attach permissions without asking the user", SetAutoGrantAttachPerms); |
| 80 | } | 80 | } |
| 81 | } | 81 | } |
| 82 | else | 82 | else |