6 files changed, 36 insertions, 28 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index debcad3..4185813 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1691,9 +1691,9 @@ namespace OpenSim.Region.Framework.Scenes
                 UUID copyID = UUID.Random();
                 bool modrights = Permissions.CanEditObject(part.ParentGroup, remoteClient);
                 part.ParentGroup.AddInventoryItem(remoteClient.AgentId, primLocalID, item, copyID, modrights);
-                m_log.InfoFormat(
-                    "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}",
-                    item.Name, primLocalID, remoteClient.Name);
+////                m_log.InfoFormat(
+////                    "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}",
+////                    item.Name, primLocalID, remoteClient.Name);
                 part.SendPropertiesToClient(remoteClient);
                 if (!Permissions.BypassPermissions())
                 {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0c5007a..5f1497a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1770,15 +1770,15 @@ namespace OpenSim.Region.Framework.Scenes
                         GC.Collect();
                         if (!LoginLock)
                         {
+                            m_sceneGridService.InformNeighborsThatRegionisUp(
+                            RequestModuleInterface<INeighbourService>(), RegionInfo);
+
                             if (!StartDisabled)
                             {
                                 m_log.InfoFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName);
                                 LoginsEnabled = true;
                             }
 
-                            m_sceneGridService.InformNeighborsThatRegionisUp(
-                                RequestModuleInterface<INeighbourService>(), RegionInfo);
-
                             // Region ready should always be set
                             Ready = true;
 
@@ -1805,7 +1805,7 @@ namespace OpenSim.Region.Framework.Scenes
                                 }
                             }
                         }
-                        else
+////                        else
                         {
                             // This handles a case of a region having no scripts for the RegionReady module
                             if (m_sceneGraph.GetActiveScriptsCount() == 0)
@@ -3716,7 +3716,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     isChildAgent = avatar.IsChildAgent;
 
-                    m_log.DebugFormat(
+                    m_log.InfoFormat(
                         "[SCENE]: Removing {0} agent {1} {2} from {3}",
                         isChildAgent ? "child" : "root", avatar.Name, agentID, Name);
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index c89a123..fdfa1e9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (neighbour != null)
             {
-                m_log.DebugFormat("{0} Region {1} successfully informed neighbour {2} at {3}-{4} that it is up",
+                m_log.InfoFormat("{0} Region {1} successfully informed neighbour {2} at {3}-{4} that it is up",
                     LogHeader, m_scene.Name, neighbour.RegionName, Util.WorldToRegionLoc(x), Util.WorldToRegionLoc(y));
 
                 m_scene.EventManager.TriggerOnRegionUp(neighbour);
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
-            m_log.DebugFormat(
+            m_log.InfoFormat(
                 "{0} Informing {1} neighbours that region {2} is up",
                 LogHeader, onlineNeighbours.Count, m_scene.Name);
 
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
index 41f3ef4..5302e8b 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -176,10 +176,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     i++;
                 }
             }
-            catch (Exception e)
+            catch /*(Exception e)*/
             {
-                m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ",  e);
-                Util.LogFailedXML("[COALESCED SCENE OBJECTS SERIALIZER]:", xml);
+                m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ");
+////                m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e);
+////                Util.LogFailedXML("[COALESCED SCENE OBJECTS SERIALIZER]:", xml);
                 return false;
             }
 
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index ae8f6f6..d9a1f93 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -69,10 +69,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     {
                         return FromOriginalXmlFormat(reader);
                     }
-                    catch (Exception e)
+                    catch /*(Exception e)*/
                     {
-                        m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e);
-                        Util.LogFailedXML("[SERIALIZER]:", fixedData);
+                        m_log.Error("[SERIALIZER]: Deserialization of xml failed ");
+////                        m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e);
+////                        Util.LogFailedXML("[SERIALIZER]:", fixedData);
                         return null;
                     }
                 }
@@ -307,10 +308,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 //                sceneObject.AggregatePerms();
                 return sceneObject;
             }
-            catch (Exception e)
+            catch /*(Exception e)*/
             {
-                m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e);
-                Util.LogFailedXML("[SERIALIZER]:", xmlData);
+                m_log.Error("[SERIALIZER]: Deserialization of xml failed ");
+////                m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e);
+////                Util.LogFailedXML("[SERIALIZER]:", xmlData);
                 return null;
             }
         }
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index d0c48b7..88a93b5 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -573,18 +573,23 @@ namespace OpenSim.Region.Framework.Scenes
         {
             string xml = Utils.BytesToString(sceneObjectAsset.Data);
 
-            CoalescedSceneObjects coa;
-            if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa))
-            {
-                foreach (SceneObjectGroup sog in coa.Objects)
-                    AddForInspection(sog);
-            }
+            if (String.IsNullOrEmpty(xml))
+                m_log.ErrorFormat("[UUIDGatherer]: Asset {0} - {1} has a zero length XML blob!", sceneObjectAsset.Name, sceneObjectAsset.ID);
             else
             {
-                SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
+                CoalescedSceneObjects coa;
+                if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa))
+                {
+                    foreach (SceneObjectGroup sog in coa.Objects)
+                        AddForInspection(sog);
+                }
+                else
+                {
+                    SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
 
-                if (null != sog)
-                    AddForInspection(sog);
+                    if (null != sog)
+                        AddForInspection(sog);
+                }
             }
         }