diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs index 702b503..7879f83 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs | |||
@@ -49,18 +49,18 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
49 | public class EstateManagementCommands | 49 | public class EstateManagementCommands |
50 | { | 50 | { |
51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
52 | 52 | ||
53 | protected EstateManagementModule m_module; | 53 | protected EstateManagementModule m_module; |
54 | 54 | ||
55 | public EstateManagementCommands(EstateManagementModule module) | 55 | public EstateManagementCommands(EstateManagementModule module) |
56 | { | 56 | { |
57 | m_module = module; | 57 | m_module = module; |
58 | } | 58 | } |
59 | 59 | ||
60 | public void Initialise() | 60 | public void Initialise() |
61 | { | 61 | { |
62 | // m_log.DebugFormat("[ESTATE MODULE]: Setting up estate commands for region {0}", m_module.Scene.RegionInfo.RegionName); | 62 | // m_log.DebugFormat("[ESTATE MODULE]: Setting up estate commands for region {0}", m_module.Scene.RegionInfo.RegionName); |
63 | 63 | ||
64 | m_module.Scene.AddCommand("Regions", m_module, "set terrain texture", | 64 | m_module.Scene.AddCommand("Regions", m_module, "set terrain texture", |
65 | "set terrain texture <number> <uuid> [<x>] [<y>]", | 65 | "set terrain texture <number> <uuid> [<x>] [<y>]", |
66 | "Sets the terrain <number> to <uuid>, if <x> or <y> are specified, it will only " + | 66 | "Sets the terrain <number> to <uuid>, if <x> or <y> are specified, it will only " + |
@@ -77,14 +77,14 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
77 | 77 | ||
78 | m_module.Scene.AddCommand("Regions", m_module, "set water height", | 78 | m_module.Scene.AddCommand("Regions", m_module, "set water height", |
79 | "set water height <height> [<x>] [<y>]", | 79 | "set water height <height> [<x>] [<y>]", |
80 | "Sets the water height in meters. If <x> and <y> are specified, it will only set it on regions with a matching coordinate. " + | 80 | "Sets the water height in meters. If <x> and <y> are specified, it will only set it on regions with a matching coordinate. " + |
81 | "Specify -1 in <x> or <y> to wildcard that coordinate.", | 81 | "Specify -1 in <x> or <y> to wildcard that coordinate.", |
82 | consoleSetWaterHeight); | 82 | consoleSetWaterHeight); |
83 | 83 | ||
84 | m_module.Scene.AddCommand( | 84 | m_module.Scene.AddCommand( |
85 | "Estates", m_module, "estate show", "estate show", "Shows all estates on the simulator.", ShowEstatesCommand); | 85 | "Estates", m_module, "estate show", "estate show", "Shows all estates on the simulator.", ShowEstatesCommand); |
86 | } | 86 | } |
87 | 87 | ||
88 | public void Close() {} | 88 | public void Close() {} |
89 | 89 | ||
90 | #region CommandHandlers | 90 | #region CommandHandlers |
@@ -120,7 +120,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
120 | m_module.Scene.RegionInfo.RegionSettings.TerrainTexture4 = texture; | 120 | m_module.Scene.RegionInfo.RegionSettings.TerrainTexture4 = texture; |
121 | break; | 121 | break; |
122 | } | 122 | } |
123 | 123 | ||
124 | m_module.Scene.RegionInfo.RegionSettings.Save(); | 124 | m_module.Scene.RegionInfo.RegionSettings.Save(); |
125 | m_module.TriggerRegionInfoChange(); | 125 | m_module.TriggerRegionInfoChange(); |
126 | m_module.sendRegionHandshakeToAll(); | 126 | m_module.sendRegionHandshakeToAll(); |
@@ -130,7 +130,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
130 | protected void consoleSetWaterHeight(string module, string[] args) | 130 | protected void consoleSetWaterHeight(string module, string[] args) |
131 | { | 131 | { |
132 | string heightstring = args[3]; | 132 | string heightstring = args[3]; |
133 | 133 | ||
134 | int x = (args.Length > 4 ? int.Parse(args[4]) : -1); | 134 | int x = (args.Length > 4 ? int.Parse(args[4]) : -1); |
135 | int y = (args.Length > 5 ? int.Parse(args[5]) : -1); | 135 | int y = (args.Length > 5 ? int.Parse(args[5]) : -1); |
136 | 136 | ||
@@ -143,13 +143,13 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
143 | m_log.Debug("[ESTATEMODULE]: Setting water height in " + m_module.Scene.RegionInfo.RegionName + " to " + | 143 | m_log.Debug("[ESTATEMODULE]: Setting water height in " + m_module.Scene.RegionInfo.RegionName + " to " + |
144 | string.Format(" {0}", selectedheight)); | 144 | string.Format(" {0}", selectedheight)); |
145 | m_module.Scene.RegionInfo.RegionSettings.WaterHeight = selectedheight; | 145 | m_module.Scene.RegionInfo.RegionSettings.WaterHeight = selectedheight; |
146 | 146 | ||
147 | m_module.Scene.RegionInfo.RegionSettings.Save(); | 147 | m_module.Scene.RegionInfo.RegionSettings.Save(); |
148 | m_module.TriggerRegionInfoChange(); | 148 | m_module.TriggerRegionInfoChange(); |
149 | m_module.sendRegionHandshakeToAll(); | 149 | m_module.sendRegionHandshakeToAll(); |
150 | } | 150 | } |
151 | } | 151 | } |
152 | } | 152 | } |
153 | protected void consoleSetTerrainHeights(string module, string[] args) | 153 | protected void consoleSetTerrainHeights(string module, string[] args) |
154 | { | 154 | { |
155 | string num = args[3]; | 155 | string num = args[3]; |
@@ -198,31 +198,31 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
198 | m_module.Scene.RegionInfo.RegionSettings.Elevation2NE = highValue; | 198 | m_module.Scene.RegionInfo.RegionSettings.Elevation2NE = highValue; |
199 | break; | 199 | break; |
200 | } | 200 | } |
201 | 201 | ||
202 | m_module.Scene.RegionInfo.RegionSettings.Save(); | 202 | m_module.Scene.RegionInfo.RegionSettings.Save(); |
203 | m_module.TriggerRegionInfoChange(); | 203 | m_module.TriggerRegionInfoChange(); |
204 | m_module.sendRegionHandshakeToAll(); | 204 | m_module.sendRegionHandshakeToAll(); |
205 | } | 205 | } |
206 | } | 206 | } |
207 | } | 207 | } |
208 | 208 | ||
209 | protected void ShowEstatesCommand(string module, string[] cmd) | 209 | protected void ShowEstatesCommand(string module, string[] cmd) |
210 | { | 210 | { |
211 | StringBuilder report = new StringBuilder(); | 211 | StringBuilder report = new StringBuilder(); |
212 | RegionInfo ri = m_module.Scene.RegionInfo; | 212 | RegionInfo ri = m_module.Scene.RegionInfo; |
213 | EstateSettings es = ri.EstateSettings; | 213 | EstateSettings es = ri.EstateSettings; |
214 | 214 | ||
215 | report.AppendFormat("Estate information for region {0}\n", ri.RegionName); | 215 | report.AppendFormat("Estate information for region {0}\n", ri.RegionName); |
216 | report.AppendFormat( | 216 | report.AppendFormat( |
217 | "{0,-20} {1,-7} {2,-20}\n", | 217 | "{0,-20} {1,-7} {2,-20}\n", |
218 | "Estate Name", | 218 | "Estate Name", |
219 | "ID", | 219 | "ID", |
220 | "Owner"); | 220 | "Owner"); |
221 | 221 | ||
222 | report.AppendFormat( | 222 | report.AppendFormat( |
223 | "{0,-20} {1,-7} {2,-20}\n", | 223 | "{0,-20} {1,-7} {2,-20}\n", |
224 | es.EstateName, es.EstateID, m_module.UserManager.GetUserName(es.EstateOwner)); | 224 | es.EstateName, es.EstateID, m_module.UserManager.GetUserName(es.EstateOwner)); |
225 | 225 | ||
226 | MainConsole.Instance.Output(report.ToString()); | 226 | MainConsole.Instance.Output(report.ToString()); |
227 | } | 227 | } |
228 | #endregion | 228 | #endregion |