diff options
| author | Melanie | 2011-05-20 22:38:05 +0100 |
|---|---|---|
| committer | Melanie | 2011-05-20 22:38:05 +0100 |
| commit | e62d1cc480ef98be5621ed809c2dd7f1e8d16dd9 (patch) | |
| tree | 746085bf27044b477fc4552228b14388565421ec /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | If a response cannot be obtained (the script has no handler) return a more fr... (diff) | |
| parent | Implement llGetLinKNumberOfSides(). (diff) | |
| download | opensim-SC-e62d1cc480ef98be5621ed809c2dd7f1e8d16dd9.zip opensim-SC-e62d1cc480ef98be5621ed809c2dd7f1e8d16dd9.tar.gz opensim-SC-e62d1cc480ef98be5621ed809c2dd7f1e8d16dd9.tar.bz2 opensim-SC-e62d1cc480ef98be5621ed809c2dd7f1e8d16dd9.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index bac66cb..313a469 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -620,7 +620,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 620 | "delete object uuid <UUID>", | 620 | "delete object uuid <UUID>", |
| 621 | "Delete object by uuid", HandleDeleteObject); | 621 | "Delete object by uuid", HandleDeleteObject); |
| 622 | MainConsole.Instance.Commands.AddCommand("region", false, "delete object name", | 622 | MainConsole.Instance.Commands.AddCommand("region", false, "delete object name", |
| 623 | "delete object name <UUID>", | 623 | "delete object name <name>", |
| 624 | "Delete object by name", HandleDeleteObject); | 624 | "Delete object by name", HandleDeleteObject); |
| 625 | 625 | ||
| 626 | //Bind Storage Manager functions to some land manager functions for this scene | 626 | //Bind Storage Manager functions to some land manager functions for this scene |