diff options
author | Melanie | 2012-06-28 03:21:08 +0100 |
---|---|---|
committer | Melanie | 2012-06-28 03:21:08 +0100 |
commit | 41a1903c60475fc2d98b1b11d336a3ecee0bc150 (patch) | |
tree | 0e78852eee96e9506b815cea0abbd35ac7da7f1a /OpenSim/Region/CoreModules/World | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Avoid reporting false positives when a colon is in a comment in the first lin... (diff) | |
download | opensim-SC_OLD-41a1903c60475fc2d98b1b11d336a3ecee0bc150.zip opensim-SC_OLD-41a1903c60475fc2d98b1b11d336a3ecee0bc150.tar.gz opensim-SC_OLD-41a1903c60475fc2d98b1b11d336a3ecee0bc150.tar.bz2 opensim-SC_OLD-41a1903c60475fc2d98b1b11d336a3ecee0bc150.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs index 830d9cb..e5cd3e2 100644 --- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs | |||
@@ -98,7 +98,8 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
98 | m_console.Commands.AddCommand( | 98 | m_console.Commands.AddCommand( |
99 | "Objects", false, "delete object name", | 99 | "Objects", false, "delete object name", |
100 | "delete object name [--regex] <name>", | 100 | "delete object name [--regex] <name>", |
101 | "Delete a scene object by name.\nIf --regex is specified then the name is treatead as a regular expression", | 101 | "Delete a scene object by name.", |
102 | "If --regex is specified then the name is treatead as a regular expression", | ||
102 | HandleDeleteObject); | 103 | HandleDeleteObject); |
103 | 104 | ||
104 | m_console.Commands.AddCommand( | 105 | m_console.Commands.AddCommand( |
@@ -118,7 +119,8 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
118 | false, | 119 | false, |
119 | "show object name", | 120 | "show object name", |
120 | "show object name [--regex] <name>", | 121 | "show object name [--regex] <name>", |
121 | "Show details of scene objects with the given name.\nIf --regex is specified then the name is treatead as a regular expression", | 122 | "Show details of scene objects with the given name.", |
123 | "If --regex is specified then the name is treatead as a regular expression", | ||
122 | HandleShowObjectByName); | 124 | HandleShowObjectByName); |
123 | 125 | ||
124 | m_console.Commands.AddCommand( | 126 | m_console.Commands.AddCommand( |
@@ -133,7 +135,8 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
133 | false, | 135 | false, |
134 | "show part name", | 136 | "show part name", |
135 | "show part name [--regex] <name>", | 137 | "show part name [--regex] <name>", |
136 | "Show details of scene object parts with the given name.\nIf --regex is specified then the name is treatead as a regular expression", | 138 | "Show details of scene object parts with the given name.", |
139 | "If --regex is specified then the name is treatead as a regular expression", | ||
137 | HandleShowPartByName); | 140 | HandleShowPartByName); |
138 | } | 141 | } |
139 | 142 | ||