OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

user_profiles
Mic Bowman 2013-01-31 14:54:19 -08:00
parent 1e0420431f 6a4c8824ea
commit f984922dfd
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs
View File

@ -28,6 +28,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenMetaverse;
namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
{ {
@ -152,6 +153,9 @@ namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
case "Boolean": case "Boolean":
m_args[i].ArgumentValue = Boolean.Parse(arg.ToString()); m_args[i].ArgumentValue = Boolean.Parse(arg.ToString());
break; break;
case "UUID":
m_args[i].ArgumentValue = UUID.Parse(arg.ToString());
break;
default: default:
Console.WriteLine("ERROR: Unknown desired type for argument " + m_args[i].Name + " on command " + m_name); Console.WriteLine("ERROR: Unknown desired type for argument " + m_args[i].Name + " on command " + m_name);
break; break;

2
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -917,7 +917,7 @@ namespace OpenSim.Region.Framework.Scenes
string tile = startupConfig.GetString("MaptileStaticUUID", UUID.Zero.ToString()); string tile = startupConfig.GetString("MaptileStaticUUID", UUID.Zero.ToString());
UUID tileID; 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; RegionInfo.RegionSettings.TerrainImageID = tileID;
} }