diff options
| author | Melanie | 2012-01-25 00:45:57 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-25 00:45:57 +0000 |
| commit | 427ab55058128c3cebd5ebd5e3aed93bc4337a2b (patch) | |
| tree | e50bf3ef199b3aeb208ce3cabbd242e10e65c8ca /OpenSim/Region/OptionalModules/Agent | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Make errors reported by OpenSim when it halts because it can't find certain c... (diff) | |
| download | opensim-SC_OLD-427ab55058128c3cebd5ebd5e3aed93bc4337a2b.zip opensim-SC_OLD-427ab55058128c3cebd5ebd5e3aed93bc4337a2b.tar.gz opensim-SC_OLD-427ab55058128c3cebd5ebd5e3aed93bc4337a2b.tar.bz2 opensim-SC_OLD-427ab55058128c3cebd5ebd5e3aed93bc4337a2b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Agent')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs index 95aa864..261029c 100644 --- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs +++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | |||
| @@ -88,7 +88,7 @@ namespace OpenSim.Region.CoreModules.UDP.Linden | |||
| 88 | (mod, cmd) => MainConsole.Instance.Output(HandleImageQueuesClear(cmd))); | 88 | (mod, cmd) => MainConsole.Instance.Output(HandleImageQueuesClear(cmd))); |
| 89 | 89 | ||
| 90 | scene.AddCommand( | 90 | scene.AddCommand( |
| 91 | this, "show image queues", | 91 | this, "image queues show", |
| 92 | "image queues show <first-name> <last-name>", | 92 | "image queues show <first-name> <last-name>", |
| 93 | "Show the image queues (textures downloaded via UDP) for a particular client.", | 93 | "Show the image queues (textures downloaded via UDP) for a particular client.", |
| 94 | (mod, cmd) => MainConsole.Instance.Output(GetImageQueuesReport(cmd))); | 94 | (mod, cmd) => MainConsole.Instance.Output(GetImageQueuesReport(cmd))); |
| @@ -293,7 +293,7 @@ namespace OpenSim.Region.CoreModules.UDP.Linden | |||
| 293 | private string GetImageQueuesReport(string[] showParams) | 293 | private string GetImageQueuesReport(string[] showParams) |
| 294 | { | 294 | { |
| 295 | if (showParams.Length < 5 || showParams.Length > 6) | 295 | if (showParams.Length < 5 || showParams.Length > 6) |
| 296 | return "Usage: show image queues <first-name> <last-name> [full]"; | 296 | return "Usage: image queues show <first-name> <last-name> [full]"; |
| 297 | 297 | ||
| 298 | string firstName = showParams[3]; | 298 | string firstName = showParams[3]; |
| 299 | string lastName = showParams[4]; | 299 | string lastName = showParams[4]; |