diff options
| author | Melanie | 2010-12-20 02:49:31 +0000 |
|---|---|---|
| committer | Melanie | 2010-12-20 02:49:31 +0000 |
| commit | 11eabf0e51c213a07cf9cc2048ae67b68ea573ef (patch) | |
| tree | bd046ac4dbfd93ae8801d29318a58b3b52432330 /OpenSim/Services/GridService | |
| parent | fix 'system.exception: unknown type in list.size: system.uint32' (diff) | |
| parent | Put the coarse location updates back to 50 frames, otherwise the dots on the ... (diff) | |
| download | opensim-SC-11eabf0e51c213a07cf9cc2048ae67b68ea573ef.zip opensim-SC-11eabf0e51c213a07cf9cc2048ae67b68ea573ef.tar.gz opensim-SC-11eabf0e51c213a07cf9cc2048ae67b68ea573ef.tar.bz2 opensim-SC-11eabf0e51c213a07cf9cc2048ae67b68ea573ef.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/GridService')
| -rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index 643d0fc..c02c813 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
| @@ -143,9 +143,9 @@ namespace OpenSim.Services.GridService | |||
| 143 | 143 | ||
| 144 | if (MainConsole.Instance != null) | 144 | if (MainConsole.Instance != null) |
| 145 | { | 145 | { |
| 146 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region", | 146 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region", |
| 147 | "link-region <Xloc> <Yloc> <ServerURI> [<RemoteRegionName>]", | 147 | "link-region <Xloc> <Yloc> <ServerURI> [<RemoteRegionName>]", |
| 148 | "Link a HyperGrid Region", RunCommand); | 148 | "Link a HyperGrid Region. Examples for <ServerURI>: http://grid.net:8002/ or http://example.org/path/foo.php", RunCommand); |
| 149 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region", | 149 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region", |
| 150 | "link-region <Xloc> <Yloc> <RegionIP> <RegionPort> [<RemoteRegionName>]", | 150 | "link-region <Xloc> <Yloc> <RegionIP> <RegionPort> [<RemoteRegionName>]", |
| 151 | "Link a hypergrid region (deprecated)", RunCommand); | 151 | "Link a hypergrid region (deprecated)", RunCommand); |