diff options
| author | UbitUmarov | 2015-11-01 03:01:59 +0000 |
|---|---|---|
| committer | UbitUmarov | 2015-11-01 03:01:59 +0000 |
| commit | 72684592ba196095311b308407cbe5751c6dd8dd (patch) | |
| tree | c51a1fb67c6d425b1cb904e788bac8a720d951c8 /OpenSim/Region/CoreModules/World | |
| parent | fix cut points of UTF-8 strings (diff) | |
| parent | Minor: Add an initializer to show what the default value would be. (diff) | |
| download | opensim-SC_OLD-72684592ba196095311b308407cbe5751c6dd8dd.zip opensim-SC_OLD-72684592ba196095311b308407cbe5751c6dd8dd.tar.gz opensim-SC_OLD-72684592ba196095311b308407cbe5751c6dd8dd.tar.bz2 opensim-SC_OLD-72684592ba196095311b308407cbe5751c6dd8dd.tar.xz | |
Merge branch 'master' into avinationmerge
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
OpenSim/Framework/Servers/ServerBase.cs
OpenSim/Framework/VersionInfo.cs
OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/GatekeeperService.cs
OpenSim/Services/Interfaces/IAvatarService.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs b/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs index 8d192ba..b9bcb8b 100644 --- a/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs +++ b/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs | |||
| @@ -100,7 +100,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
| 100 | 100 | ||
| 101 | m_console.Commands.AddCommand( | 101 | m_console.Commands.AddCommand( |
| 102 | "Regions", false, "region set", | 102 | "Regions", false, "region set", |
| 103 | "region get", | 103 | "region set", |
| 104 | "Set control information for the currently selected region.", | 104 | "Set control information for the currently selected region.", |
| 105 | "Currently, the following parameters can be set:\n" | 105 | "Currently, the following parameters can be set:\n" |
| 106 | + "agent-limit <int> - Current root agent limit. This is persisted over restart.\n" | 106 | + "agent-limit <int> - Current root agent limit. This is persisted over restart.\n" |