aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar
diff options
context:
space:
mode:
authorBlueWall2013-03-05 15:30:54 -0500
committerBlueWall2013-03-05 15:30:54 -0500
commitf676408e2a45101bcab0a33f598ea9047f02036a (patch)
treeeb34ea8fb0a783ee466873462285eba629ab6405 /OpenSim/Region/OptionalModules/Avatar
parentAdd method to remove JsonRpc Handlers from the server (diff)
parent* Add a Max Payload size property to the Websocket Server Handler. If you ... (diff)
downloadopensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.zip
opensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.tar.gz
opensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.tar.bz2
opensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs2
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 d7fb272..1e7bc02 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