From 17440d8a2960005d0d88cfe5248930986331d520 Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Thu, 31 Jan 2013 11:14:43 -0800
Subject: Added option for UUID as command parameters. This lets the command
 handle the UUID parsing and type checking before the command is executed.

---
 OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs
index 4004135..b9786ae 100644
--- a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs
+++ b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections.Generic;
 using OpenSim.Region.Framework.Interfaces;
+using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
 {
@@ -152,6 +153,9 @@ namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
                         case "Boolean":
                             m_args[i].ArgumentValue = Boolean.Parse(arg.ToString());
                             break;
+                        case "UUID":
+                            m_args[i].ArgumentValue = UUID.Parse(arg.ToString());
+                            break;
                         default:
                             Console.WriteLine("ERROR: Unknown desired type for argument " + m_args[i].Name + " on command " + m_name);
                             break;
-- 
cgit v1.1


From 6a4c8824ea6568290fe7a2ff1b6a9b4d96896d5f Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 31 Jan 2013 20:46:41 +0000
Subject: Whitespace fix and removing unneccessary parentheses

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9e3d60f..f8d84e3 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -917,7 +917,7 @@ namespace OpenSim.Region.Framework.Scenes
                     string tile = startupConfig.GetString("MaptileStaticUUID", UUID.Zero.ToString());
                     UUID tileID;
 
-                    if ((tile!=UUID.Zero.ToString()) && UUID.TryParse(tile, out tileID))
+                    if (tile != UUID.Zero.ToString() && UUID.TryParse(tile, out tileID))
                     {
                         RegionInfo.RegionSettings.TerrainImageID = tileID;
                     }
-- 
cgit v1.1