* 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!

1 files changed, 13 insertions, 2 deletions

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;
         }