aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xOpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs6
-rwxr-xr-xOpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs2
-rwxr-xr-xOpenSim/Region/OptionalModules/Agent/TextureSender/J2KDecoderCommandModule.cs9
-rwxr-xr-xOpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs20
-rwxr-xr-xOpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs7
-rwxr-xr-xOpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs9
-rwxr-xr-xOpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs4
-rwxr-xr-xOpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs4
-rwxr-xr-xOpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreCommands.cs2
-rwxr-xr-xOpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs4
-rwxr-xr-xOpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs2
-rwxr-xr-xOpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs4
-rwxr-xr-xOpenSim/Region/ScriptEngine/XEngine/ScriptEngineConsoleCommands.cs4
-rwxr-xr-xOpenSim/Region/ScriptEngine/XEngine/XEngine.cs14
14 files changed, 39 insertions, 52 deletions
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index 18a16c2..04eacbc 100755
--- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -917,7 +917,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
917 m_scene.ForEachSOG(searchAction); 917 m_scene.ForEachSOG(searchAction);
918 918
919 if (sceneObjects.Count == 0) 919 if (sceneObjects.Count == 0)
920 m_console.Output("No objects with name {0} found in {1}", null, name, m_scene.RegionInfo.RegionName); 920 m_console.Output("No objects with name {0} found in {1}", name, m_scene.RegionInfo.RegionName);
921 921
922 return sceneObjects; 922 return sceneObjects;
923 } 923 }
@@ -952,7 +952,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
952 952
953 if (!ConsoleUtil.TryParseConsoleMinVector(rawConsoleStartVector, out startVector)) 953 if (!ConsoleUtil.TryParseConsoleMinVector(rawConsoleStartVector, out startVector))
954 { 954 {
955 m_console.Output("Error: Start vector '{0}' does not have a valid format", null, rawConsoleStartVector); 955 m_console.Output("Error: Start vector '{0}' does not have a valid format", rawConsoleStartVector);
956 endVector = Vector3.Zero; 956 endVector = Vector3.Zero;
957 957
958 return false; 958 return false;
@@ -962,7 +962,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
962 962
963 if (!ConsoleUtil.TryParseConsoleMaxVector(rawConsoleEndVector, out endVector)) 963 if (!ConsoleUtil.TryParseConsoleMaxVector(rawConsoleEndVector, out endVector))
964 { 964 {
965 m_console.Output("Error: End vector '{0}' does not have a valid format", null, rawConsoleEndVector); 965 m_console.Output("Error: End vector '{0}' does not have a valid format", rawConsoleEndVector);
966 return false; 966 return false;
967 } 967 }
968 968
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 02f0d3d..e00fafb 100755
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -1538,7 +1538,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
1538 } 1538 }
1539 else 1539 else
1540 { 1540 {
1541 MainConsole.Instance.Output("ERROR: Unrecognised direction {0} - need x or y", null, direction); 1541 MainConsole.Instance.Output("ERROR: Unrecognised direction {0} - need x or y", direction);
1542 } 1542 }
1543 } 1543 }
1544 1544
diff --git a/OpenSim/Region/OptionalModules/Agent/TextureSender/J2KDecoderCommandModule.cs b/OpenSim/Region/OptionalModules/Agent/TextureSender/J2KDecoderCommandModule.cs
index 1f4c65a..cb72f23 100755
--- a/OpenSim/Region/OptionalModules/Agent/TextureSender/J2KDecoderCommandModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/TextureSender/J2KDecoderCommandModule.cs
@@ -114,20 +114,20 @@ namespace OpenSim.Region.OptionalModules.Agent.TextureSender
114 114
115 if (!UUID.TryParse(rawAssetId, out assetId)) 115 if (!UUID.TryParse(rawAssetId, out assetId))
116 { 116 {
117 MainConsole.Instance.Output("ERROR: {0} is not a valid ID format", null, rawAssetId); 117 MainConsole.Instance.Output("ERROR: {0} is not a valid ID format", rawAssetId);
118 return; 118 return;
119 } 119 }
120 120
121 AssetBase asset = m_scene.AssetService.Get(assetId.ToString()); 121 AssetBase asset = m_scene.AssetService.Get(assetId.ToString());
122 if (asset == null) 122 if (asset == null)
123 { 123 {
124 MainConsole.Instance.Output("ERROR: No asset found with ID {0}", null, assetId); 124 MainConsole.Instance.Output("ERROR: No asset found with ID {0}", assetId);
125 return; 125 return;
126 } 126 }
127 127
128 if (asset.Type != (sbyte)AssetType.Texture) 128 if (asset.Type != (sbyte)AssetType.Texture)
129 { 129 {
130 MainConsole.Instance.Output("ERROR: Asset {0} is not a texture type", null, assetId); 130 MainConsole.Instance.Output("ERROR: Asset {0} is not a texture type", assetId);
131 return; 131 return;
132 } 132 }
133 133
@@ -144,12 +144,11 @@ namespace OpenSim.Region.OptionalModules.Agent.TextureSender
144 { 144 {
145 MainConsole.Instance.Output( 145 MainConsole.Instance.Output(
146 "Successfully decoded asset {0} with {1} layers and {2} components", 146 "Successfully decoded asset {0} with {1} layers and {2} components",
147 null,
148 assetId, layers.Length, components); 147 assetId, layers.Length, components);
149 } 148 }
150 else 149 else
151 { 150 {
152 MainConsole.Instance.Output("Decode of asset {0} failed", null, assetId); 151 MainConsole.Instance.Output("Decode of asset {0} failed", assetId);
153 } 152 }
154 } 153 }
155 } 154 }
diff --git a/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs b/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs
index 89c6637..21bd2f4 100755
--- a/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs
@@ -115,14 +115,14 @@ namespace OpenSim.Region.OptionalModules.Asset
115 115
116 if (!UUID.TryParse(rawAssetId, out assetId)) 116 if (!UUID.TryParse(rawAssetId, out assetId))
117 { 117 {
118 MainConsole.Instance.Output("ERROR: {0} is not a valid ID format", null, rawAssetId); 118 MainConsole.Instance.Output("ERROR: {0} is not a valid ID format", rawAssetId);
119 return; 119 return;
120 } 120 }
121 121
122 AssetBase asset = m_scene.AssetService.Get(assetId.ToString()); 122 AssetBase asset = m_scene.AssetService.Get(assetId.ToString());
123 if (asset == null) 123 if (asset == null)
124 { 124 {
125 MainConsole.Instance.Output("ERROR: No asset found with ID {0}", null, assetId); 125 MainConsole.Instance.Output("ERROR: No asset found with ID {0}", assetId);
126 return; 126 return;
127 } 127 }
128 128
@@ -139,7 +139,7 @@ namespace OpenSim.Region.OptionalModules.Asset
139 } 139 }
140 } 140 }
141 141
142 MainConsole.Instance.Output("Asset dumped to file {0}", null, fileName); 142 MainConsole.Instance.Output("Asset dumped to file {0}", fileName);
143 } 143 }
144 144
145 void HandleShowAsset(string module, string[] args) 145 void HandleShowAsset(string module, string[] args)
@@ -160,13 +160,13 @@ namespace OpenSim.Region.OptionalModules.Asset
160 160
161 int i; 161 int i;
162 162
163 MainConsole.Instance.Output("Name: {0}", null, asset.Name); 163 MainConsole.Instance.Output("Name: {0}", asset.Name);
164 MainConsole.Instance.Output("Description: {0}", null, asset.Description); 164 MainConsole.Instance.Output("Description: {0}", asset.Description);
165 MainConsole.Instance.Output("Type: {0} (type number = {1})", null, (AssetType)asset.Type, asset.Type); 165 MainConsole.Instance.Output("Type: {0} (type number = {1})", (AssetType)asset.Type, asset.Type);
166 MainConsole.Instance.Output("Content-type: {0}", null, asset.Metadata.ContentType); 166 MainConsole.Instance.Output("Content-type: {0}", asset.Metadata.ContentType);
167 MainConsole.Instance.Output("Size: {0} bytes", null, asset.Data.Length); 167 MainConsole.Instance.Output("Size: {0} bytes", asset.Data.Length);
168 MainConsole.Instance.Output("Temporary: {0}", null, asset.Temporary ? "yes" : "no"); 168 MainConsole.Instance.Output("Temporary: {0}", asset.Temporary ? "yes" : "no");
169 MainConsole.Instance.Output("Flags: {0}", null, asset.Metadata.Flags); 169 MainConsole.Instance.Output("Flags: {0}", asset.Metadata.Flags);
170 170
171 for (i = 0 ; i < 5 ; i++) 171 for (i = 0 ; i < 5 ; i++)
172 { 172 {
diff --git a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
index 1db9ba7..68cdb3b 100755
--- a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs
@@ -180,7 +180,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
180 { 180 {
181 MainConsole.Instance.Output( 181 MainConsole.Instance.Output(
182 "Sending appearance information for {0} to all other avatars in {1}", 182 "Sending appearance information for {0} to all other avatars in {1}",
183 null,
184 sp.Name, scene.RegionInfo.RegionName); 183 sp.Name, scene.RegionInfo.RegionName);
185 184
186 scene.AvatarFactory.SendAppearance(sp.UUID); 185 scene.AvatarFactory.SendAppearance(sp.UUID);
@@ -193,7 +192,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
193 { 192 {
194 MainConsole.Instance.Output( 193 MainConsole.Instance.Output(
195 "Sending appearance information for {0} to all other avatars in {1}", 194 "Sending appearance information for {0} to all other avatars in {1}",
196 null,
197 sp.Name, scene.RegionInfo.RegionName); 195 sp.Name, scene.RegionInfo.RegionName);
198 196
199 scene.AvatarFactory.SendAppearance(sp.UUID); 197 scene.AvatarFactory.SendAppearance(sp.UUID);
@@ -240,7 +238,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
240 { 238 {
241 bool bakedTextureValid = scene.AvatarFactory.ValidateBakedTextureCache(sp); 239 bool bakedTextureValid = scene.AvatarFactory.ValidateBakedTextureCache(sp);
242 MainConsole.Instance.Output( 240 MainConsole.Instance.Output(
243 "{0} baked appearance texture is {1}", null, sp.Name, bakedTextureValid ? "OK" : "incomplete"); 241 "{0} baked appearance texture is {1}", sp.Name, bakedTextureValid ? "OK" : "incomplete");
244 } 242 }
245 ); 243 );
246 } 244 }
@@ -271,12 +269,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
271 if (rebakesRequested > 0) 269 if (rebakesRequested > 0)
272 MainConsole.Instance.Output( 270 MainConsole.Instance.Output(
273 "Requesting rebake of {0} uploaded textures for {1} in {2}", 271 "Requesting rebake of {0} uploaded textures for {1} in {2}",
274 null,
275 rebakesRequested, sp.Name, scene.RegionInfo.RegionName); 272 rebakesRequested, sp.Name, scene.RegionInfo.RegionName);
276 else 273 else
277 MainConsole.Instance.Output( 274 MainConsole.Instance.Output(
278 "No texture IDs available for rebake request for {0} in {1}", 275 "No texture IDs available for rebake request for {0} in {1}",
279 null,
280 sp.Name, scene.RegionInfo.RegionName); 276 sp.Name, scene.RegionInfo.RegionName);
281 } 277 }
282 } 278 }
@@ -320,7 +316,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
320 { 316 {
321 MainConsole.Instance.Output( 317 MainConsole.Instance.Output(
322 "{0} matched {1}", 318 "{0} matched {1}",
323 null,
324 rawUuid, 319 rawUuid,
325 string.Join(", ", matchedAvatars.ToList().ConvertAll<string>(sp => sp.Name).ToArray())); 320 string.Join(", ", matchedAvatars.ToList().ConvertAll<string>(sp => sp.Name).ToArray()));
326 } 321 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
index 030c9eb..a913ec4 100755
--- a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
@@ -136,7 +136,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
136 136
137 if (userId == UUID.Zero) 137 if (userId == UUID.Zero)
138 { 138 {
139 MainConsole.Instance.Output("No such user as {0} {1}", null, firstName, lastName); 139 MainConsole.Instance.Output("No such user as {0} {1}", firstName, lastName);
140 return; 140 return;
141 } 141 }
142 142
@@ -146,7 +146,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
146 { 146 {
147 if (!m_friendsModule.AreFriendsCached(userId)) 147 if (!m_friendsModule.AreFriendsCached(userId))
148 { 148 {
149 MainConsole.Instance.Output("No friends cached on this simulator for {0} {1}", null, firstName, lastName); 149 MainConsole.Instance.Output("No friends cached on this simulator for {0} {1}", firstName, lastName);
150 return; 150 return;
151 } 151 }
152 else 152 else
@@ -162,10 +162,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
162 friends = ((FriendsModule)m_friendsModule).FriendsService.GetFriends(userId); 162 friends = ((FriendsModule)m_friendsModule).FriendsService.GetFriends(userId);
163 } 163 }
164 164
165 MainConsole.Instance.Output("Friends for {0} {1} {2}:", null, firstName, lastName, userId); 165 MainConsole.Instance.Output("Friends for {0} {1} {2}:", firstName, lastName, userId);
166 166
167 MainConsole.Instance.Output( 167 MainConsole.Instance.Output(
168 "{0,-36} {1,-36} {2,-7} {3,7} {4,10}", null, "UUID", "Name", "Status", "MyFlags", "TheirFlags"); 168 "{0,-36} {1,-36} {2,-7} {3,7} {4,10}", "UUID", "Name", "Status", "MyFlags", "TheirFlags");
169 169
170 foreach (FriendInfo friend in friends) 170 foreach (FriendInfo friend in friends)
171 { 171 {
@@ -193,7 +193,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
193 193
194 MainConsole.Instance.Output( 194 MainConsole.Instance.Output(
195 "{0,-36} {1,-36} {2,-7} {3,-7} {4,-10}", 195 "{0,-36} {1,-36} {2,-7} {3,-7} {4,-10}",
196 null,
197 friend.Friend, friendName, onlineText, friend.MyFlags, friend.TheirFlags); 196 friend.Friend, friendName, onlineText, friend.MyFlags, friend.TheirFlags);
198 } 197 }
199 } 198 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
index 1dd5b0a..ef7d852 100755
--- a/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
@@ -144,7 +144,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand
144 { 144 {
145 MainConsole.Instance.Output( 145 MainConsole.Instance.Output(
146 "Sitting {0} on {1} {2} in {3}", 146 "Sitting {0} on {1} {2} in {3}",
147 null,
148 sp.Name, sitPart.ParentGroup.Name, sitPart.ParentGroup.UUID, m_scene.Name); 147 sp.Name, sitPart.ParentGroup.Name, sitPart.ParentGroup.UUID, m_scene.Name);
149 148
150 sp.HandleAgentRequestSit(sp.ControllingClient, sp.UUID, sitPart.UUID, Vector3.Zero); 149 sp.HandleAgentRequestSit(sp.ControllingClient, sp.UUID, sitPart.UUID, Vector3.Zero);
@@ -154,7 +153,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand
154 { 153 {
155 MainConsole.Instance.Output( 154 MainConsole.Instance.Output(
156 "Could not find any unoccupied set seat on which to sit {0} in {1}. Aborting", 155 "Could not find any unoccupied set seat on which to sit {0} in {1}. Aborting",
157 null,
158 sp.Name, m_scene.Name); 156 sp.Name, m_scene.Name);
159 157
160 break; 158 break;
@@ -179,7 +177,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand
179 { 177 {
180 if (sp.SitGround || sp.IsSatOnObject) 178 if (sp.SitGround || sp.IsSatOnObject)
181 { 179 {
182 MainConsole.Instance.Output("Standing {0} in {1}", null, sp.Name, m_scene.Name); 180 MainConsole.Instance.Output("Standing {0} in {1}", sp.Name, m_scene.Name);
183 sp.StandUp(); 181 sp.StandUp();
184 } 182 }
185 } 183 }
diff --git a/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs b/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs
index 9bcbfda..943fe5b 100755
--- a/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs
+++ b/OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs
@@ -256,13 +256,13 @@ namespace OpenSim.Region.OptionalModules.PhysicsParameters
256 private void WriteOut(string msg, params object[] args) 256 private void WriteOut(string msg, params object[] args)
257 { 257 {
258 // m_log.InfoFormat(msg, args); 258 // m_log.InfoFormat(msg, args);
259 MainConsole.Instance.Output(msg, null, args); 259 MainConsole.Instance.Output(msg, args);
260 } 260 }
261 261
262 private void WriteError(string msg, params object[] args) 262 private void WriteError(string msg, params object[] args)
263 { 263 {
264 // m_log.ErrorFormat(msg, args); 264 // m_log.ErrorFormat(msg, args);
265 MainConsole.Instance.Output(msg, null, args); 265 MainConsole.Instance.Output(msg, args);
266 } 266 }
267 } 267 }
268} 268}
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreCommands.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreCommands.cs
index ff30a5c..2db3bb4 100755
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreCommands.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreCommands.cs
@@ -186,7 +186,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
186 return; 186 return;
187 187
188 JsonStoreStats stats = m_store.GetStoreStats(); 188 JsonStoreStats stats = m_store.GetStoreStats();
189 MainConsole.Instance.Output("{0}\t{1}", null, m_scene.RegionInfo.RegionName, stats.StoreCount); 189 MainConsole.Instance.Output("{0}\t{1}", m_scene.RegionInfo.RegionName, stats.StoreCount);
190 } 190 }
191 191
192#endregion 192#endregion
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
index 7d95c7f..fb059bd 100755
--- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
@@ -109,7 +109,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
109 // This should always show up to the user but should not trigger warn/errors as these messages are 109 // This should always show up to the user but should not trigger warn/errors as these messages are
110 // expected and are not simulator problems. Ideally, there would be a status level in log4net but 110 // expected and are not simulator problems. Ideally, there would be a status level in log4net but
111 // failing that, we will print out to console instead. 111 // failing that, we will print out to console instead.
112 MainConsole.Instance.Output("Region {0} - LOGINS DISABLED DURING INITIALIZATION.", null, m_scene.Name); 112 MainConsole.Instance.Output("Region {0} - LOGINS DISABLED DURING INITIALIZATION.", m_scene.Name);
113 113
114 if (m_uri != string.Empty) 114 if (m_uri != string.Empty)
115 { 115 {
@@ -232,7 +232,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
232 // without info log messages enabled. Making this a warning is arguably misleading since it isn't a 232 // without info log messages enabled. Making this a warning is arguably misleading since it isn't a
233 // warning, and monitor scripts looking for warn/error/fatal messages will received false positives. 233 // warning, and monitor scripts looking for warn/error/fatal messages will received false positives.
234 // Arguably, log4net needs a status log level (like Apache). 234 // Arguably, log4net needs a status log level (like Apache).
235 MainConsole.Instance.Output("INITIALIZATION COMPLETE FOR {0} - LOGINS ENABLED", null, m_scene.Name); 235 MainConsole.Instance.Output("INITIALIZATION COMPLETE FOR {0} - LOGINS ENABLED", m_scene.Name);
236 } 236 }
237 237
238 m_scene.SceneGridService.InformNeighborsThatRegionisUp( 238 m_scene.SceneGridService.InformNeighborsThatRegionisUp(
diff --git a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
index 9ab9610..e5bb59d 100755
--- a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
+++ b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
@@ -327,7 +327,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
327 m_busy = false; 327 m_busy = false;
328 } 328 }
329 if (!found) 329 if (!found)
330 MainConsole.Instance.Output("No such region {0}. Nothing to backup", null, name); 330 MainConsole.Instance.Output("No such region {0}. Nothing to backup", name);
331 } 331 }
332 332
333 private void ParseDefaultConfig(IConfig config) 333 private void ParseDefaultConfig(IConfig config)
diff --git a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
index 6eac299..8596159 100755
--- a/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
+++ b/OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
@@ -145,7 +145,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
145 cdl.AddRow("teleport", m_scene.DebugTeleporting); 145 cdl.AddRow("teleport", m_scene.DebugTeleporting);
146 cdl.AddRow("updates", m_scene.DebugUpdates); 146 cdl.AddRow("updates", m_scene.DebugUpdates);
147 147
148 MainConsole.Instance.Output("Scene {0} options:", null, m_scene.Name); 148 MainConsole.Instance.Output("Scene {0} options:", m_scene.Name);
149 MainConsole.Instance.Output(cdl.ToString()); 149 MainConsole.Instance.Output(cdl.ToString());
150 } 150 }
151 151
@@ -160,7 +160,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
160 string value = args[4]; 160 string value = args[4];
161 SetSceneDebugOptions(new Dictionary<string, string>() { { key, value } }); 161 SetSceneDebugOptions(new Dictionary<string, string>() { { key, value } });
162 162
163 MainConsole.Instance.Output("Set {0} debug scene {1} = {2}", null, m_scene.Name, key, value); 163 MainConsole.Instance.Output("Set {0} debug scene {1} = {2}", m_scene.Name, key, value);
164 } 164 }
165 else 165 else
166 { 166 {
diff --git a/OpenSim/Region/ScriptEngine/XEngine/ScriptEngineConsoleCommands.cs b/OpenSim/Region/ScriptEngine/XEngine/ScriptEngineConsoleCommands.cs
index 01e35c1..d756f59 100755
--- a/OpenSim/Region/ScriptEngine/XEngine/ScriptEngineConsoleCommands.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/ScriptEngineConsoleCommands.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
89 } 89 }
90 90
91 MainConsole.Instance.Output(cdt.ToString()); 91 MainConsole.Instance.Output(cdt.ToString());
92 MainConsole.Instance.Output("Total: {0}", null, sensorInfo.Count); 92 MainConsole.Instance.Output("Total: {0}", sensorInfo.Count);
93 } 93 }
94 94
95 private void HandleShowTimers(string module, string[] cmdparams) 95 private void HandleShowTimers(string module, string[] cmdparams)
@@ -120,7 +120,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
120 } 120 }
121 121
122 MainConsole.Instance.Output(cdt.ToString()); 122 MainConsole.Instance.Output(cdt.ToString());
123 MainConsole.Instance.Output("Total: {0}", null, timersInfo.Count); 123 MainConsole.Instance.Output("Total: {0}", timersInfo.Count);
124 } 124 }
125 } 125 }
126} \ No newline at end of file 126} \ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index e4a41de..af82dc8 100755
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -456,7 +456,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
456 } 456 }
457 457
458 si.DebugLevel = newLevel; 458 si.DebugLevel = newLevel;
459 MainConsole.Instance.Output("Set debug level of {0} {1} to {2}", null, si.ScriptName, si.ItemID, newLevel); 459 MainConsole.Instance.Output("Set debug level of {0} {1} to {2}", si.ScriptName, si.ItemID, newLevel);
460 } 460 }
461 461
462 /// <summary> 462 /// <summary>
@@ -472,12 +472,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
472 if (ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, args[3], out newDebug)) 472 if (ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, args[3], out newDebug))
473 { 473 {
474 DebugLevel = newDebug; 474 DebugLevel = newDebug;
475 MainConsole.Instance.Output("Debug level set to {0} in XEngine for region {1}", null, newDebug, m_Scene.Name); 475 MainConsole.Instance.Output("Debug level set to {0} in XEngine for region {1}", newDebug, m_Scene.Name);
476 } 476 }
477 } 477 }
478 else if (args.Length == 3) 478 else if (args.Length == 3)
479 { 479 {
480 MainConsole.Instance.Output("Current debug level is {0}", null, DebugLevel); 480 MainConsole.Instance.Output("Current debug level is {0}", DebugLevel);
481 } 481 }
482 else 482 else
483 { 483 {
@@ -532,7 +532,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
532 532
533 if (!UUID.TryParse(rawItemId, out itemId)) 533 if (!UUID.TryParse(rawItemId, out itemId))
534 { 534 {
535 MainConsole.Instance.Output("ERROR: {0} is not a valid UUID", null, rawItemId); 535 MainConsole.Instance.Output("ERROR: {0} is not a valid UUID", rawItemId);
536 continue; 536 continue;
537 } 537 }
538 538
@@ -618,7 +618,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
618 lock (m_Scripts) 618 lock (m_Scripts)
619 { 619 {
620 MainConsole.Instance.Output( 620 MainConsole.Instance.Output(
621 "Showing {0} scripts in {1}", null, m_Scripts.Count, m_Scene.RegionInfo.RegionName); 621 "Showing {0} scripts in {1}", m_Scripts.Count, m_Scene.RegionInfo.RegionName);
622 } 622 }
623 } 623 }
624 624
@@ -671,7 +671,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
671 SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID); 671 SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID);
672 MainConsole.Instance.Output( 672 MainConsole.Instance.Output(
673 "Suspended {0}.{1}, item UUID {2}, prim UUID {3} @ {4}", 673 "Suspended {0}.{1}, item UUID {2}, prim UUID {3} @ {4}",
674 null,
675 instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition); 674 instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition);
676 } 675 }
677 } 676 }
@@ -685,7 +684,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
685 SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID); 684 SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID);
686 MainConsole.Instance.Output( 685 MainConsole.Instance.Output(
687 "Resumed {0}.{1}, item UUID {2}, prim UUID {3} @ {4}", 686 "Resumed {0}.{1}, item UUID {2}, prim UUID {3} @ {4}",
688 null,
689 instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition); 687 instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition);
690 } 688 }
691 } 689 }
@@ -699,7 +697,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
699 SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID); 697 SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID);
700 MainConsole.Instance.Output( 698 MainConsole.Instance.Output(
701 "Started {0}.{1}, item UUID {2}, prim UUID {3} @ {4}", 699 "Started {0}.{1}, item UUID {2}, prim UUID {3} @ {4}",
702 null,
703 instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition); 700 instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition);
704 } 701 }
705 } 702 }
@@ -715,7 +712,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
715 SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID); 712 SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID);
716 MainConsole.Instance.Output( 713 MainConsole.Instance.Output(
717 "Stopped {0}.{1}, item UUID {2}, prim UUID {3} @ {4}", 714 "Stopped {0}.{1}, item UUID {2}, prim UUID {3} @ {4}",
718 null,
719 instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition); 715 instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, sop.AbsolutePosition);
720 } 716 }
721 } 717 }