From 54563d8dea86ca1e022f3aafa791908e8bcc4912 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sun, 27 Apr 2008 22:15:38 +0000 Subject: * Patch from XenReborn to make remove-region work properly without needing to do a change-region first. Careful though. I still suggest you do a change-region first. * Patch from Melanie to implement touch_end. * Thanks XenReborn!. Thanks Melanie! --- OpenSim/Region/Environment/Scenes/SceneManager.cs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes/SceneManager.cs') diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs index 2dfea2a..4ded1a7 100644 --- a/OpenSim/Region/Environment/Scenes/SceneManager.cs +++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs @@ -268,15 +268,26 @@ namespace OpenSim.Region.Environment.Scenes public bool TryGetScene(string regionName, out Scene scene) { + scene = null; + foreach (Scene mscene in m_localScenes) { - if (String.Compare(mscene.RegionInfo.RegionName, regionName, true) == 0) + Console.Write("Region tested: " + mscene.RegionInfo.RegionName+" With ID: "+mscene.RegionInfo.RegionID.ToString()); + + + bool b = String.Compare(mscene.RegionInfo.RegionName.Trim(), regionName.Trim(), true) == 0; + + Console.WriteLine(" <==> Result: " + b.ToString()); + + if (b) { + + Console.WriteLine("FOUND assigning region to out parameter"); scene = mscene; return true; } } - scene = null; + return false; } -- cgit v1.1