diff options
Diffstat (limited to 'OpenSim/Region')
13 files changed, 66 insertions, 65 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 6994efb..c3ee6ab 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -33,6 +33,8 @@ using System.IO; | |||
33 | using System.Net; | 33 | using System.Net; |
34 | using System.Net.Sockets; | 34 | using System.Net.Sockets; |
35 | using System.Reflection; | 35 | using System.Reflection; |
36 | using System.Text; | ||
37 | using System.Text.RegularExpressions; | ||
36 | using System.Threading; | 38 | using System.Threading; |
37 | using log4net; | 39 | using log4net; |
38 | using Nini.Config; | 40 | using Nini.Config; |
@@ -1319,8 +1321,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1319 | { | 1321 | { |
1320 | if (IncomingMalformedPacketCount < 100) | 1322 | if (IncomingMalformedPacketCount < 100) |
1321 | { | 1323 | { |
1322 | m_log.WarnFormat("[LLUDPSERVER]: Malformed data, cannot parse {0} byte packet from {1}, data {2}:", | 1324 | m_log.WarnFormat("[LLUDPSERVER]: Malformed data, cannot parse {0} byte packet from {1}, data as hex {2}: {3}", |
1323 | buffer.DataLength, buffer.RemoteEndPoint, Utils.BytesToHexString(buffer.Data, buffer.DataLength, null)); | 1325 | buffer.DataLength, buffer.RemoteEndPoint, Utils.BytesToHexString(buffer.Data, buffer.DataLength, null), |
1326 | Regex.Replace(Encoding.UTF8.GetString(buffer.Data, 0, buffer.DataLength), @"\p{Cc}", a=>string.Format("[{0:X2}]", (byte)a.Value[0]))); | ||
1324 | } | 1327 | } |
1325 | 1328 | ||
1326 | RecordMalformedInboundPacket(endPoint); | 1329 | RecordMalformedInboundPacket(endPoint); |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index ad46107..520ea50 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -231,24 +231,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
231 | 231 | ||
232 | if(curErrorCntr > 0 || possible > 0) | 232 | if(curErrorCntr > 0 || possible > 0) |
233 | { | 233 | { |
234 | string spath; | ||
235 | int indx = path.IndexOf("__"); | ||
236 | if(indx > 0) | ||
237 | spath = path.Substring(0,indx); | ||
238 | else | ||
239 | spath = path; | ||
240 | |||
241 | if(curErrorCntr > 0) | 234 | if(curErrorCntr > 0) |
242 | { | 235 | { |
243 | m_log.ErrorFormat("[INVENTORY ARCHIVER Warning]: item {0} '{1}', type {2}, in '{3}', contains {4} references to missing or damaged assets", | 236 | // path is /name__UUID/name__UUID ... |
244 | inventoryItem.ID, inventoryItem.Name, itemAssetType.ToString(), spath, curErrorCntr); | 237 | m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item {0} '{1}', type {2}, in '{3}', contains {4} references to missing or damaged assets, or not a problem.", |
245 | if(possible > 0) | 238 | inventoryItem.ID, inventoryItem.Name, itemAssetType.ToString(), path, curErrorCntr); |
246 | m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item also contains {0} references that may be to missing or damaged assets or not a problem", possible); | 239 | //// if(possible > 0) |
247 | } | 240 | //// m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item also contains {0} references that may be to missing or damaged assets or not a problem", possible); |
248 | else if(possible > 0) | ||
249 | { | ||
250 | m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item {0} '{1}', type {2}, in '{3}', contains {4} references that may be to missing or damaged assets or not a problem", inventoryItem.ID, inventoryItem.Name, itemAssetType.ToString(), spath, possible); | ||
251 | } | 241 | } |
242 | //// else if(possible > 0) | ||
243 | //// { | ||
244 | //// m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item {0} '{1}', type {2}, in '{3}', contains {4} references that may be to missing or damaged assets or not a problem", inventoryItem.ID, inventoryItem.Name, itemAssetType.ToString(), spath, possible); | ||
245 | //// } | ||
252 | } | 246 | } |
253 | } | 247 | } |
254 | } | 248 | } |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs index 060e753..6b8755b 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs | |||
@@ -275,16 +275,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
275 | possible = assetGatherer.possibleNotAssetCount - possible; | 275 | possible = assetGatherer.possibleNotAssetCount - possible; |
276 | if(curErrorCntr > 0) | 276 | if(curErrorCntr > 0) |
277 | { | 277 | { |
278 | m_log.ErrorFormat("[ARCHIVER]: object {0} '{1}', at {2}, contains {3} references to missing or damaged assets", | 278 | m_log.ErrorFormat("[ARCHIVER]: object {0} '{1}', at {2}, contains {3} references to missing or damaged assets, or not a problem.", |
279 | sceneObject.UUID, sceneObject.Name ,sceneObject.AbsolutePosition.ToString(), curErrorCntr); | 279 | sceneObject.UUID, sceneObject.Name ,sceneObject.AbsolutePosition.ToString(), curErrorCntr); |
280 | if(possible > 0) | 280 | //// if(possible > 0) |
281 | m_log.WarnFormat("[ARCHIVER Warning]: object also contains {0} references that may be to missing or damaged assets or not a problem", possible); | 281 | //// m_log.WarnFormat("[ARCHIVER Warning]: object also contains {0} references that may be to missing or damaged assets or not a problem", possible); |
282 | } | ||
283 | else if(possible > 0) | ||
284 | { | ||
285 | m_log.WarnFormat("[ARCHIVER Warning]: object {0} '{1}', at {2}, contains {3} references that may be to missing or damaged assets or not a problem", | ||
286 | sceneObject.UUID, sceneObject.Name ,sceneObject.AbsolutePosition.ToString(), possible); | ||
287 | } | 282 | } |
283 | //// else if(possible > 0) | ||
284 | //// { | ||
285 | //// m_log.WarnFormat("[ARCHIVER Warning]: object {0} '{1}', at {2}, contains {3} references that may be to missing or damaged assets or not a problem", | ||
286 | //// sceneObject.UUID, sceneObject.Name ,sceneObject.AbsolutePosition.ToString(), possible); | ||
287 | //// } | ||
288 | } | 288 | } |
289 | 289 | ||
290 | assetGatherer.GatherAll(); | 290 | assetGatherer.GatherAll(); |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs index 3092fe0..0a955c5 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs | |||
@@ -143,11 +143,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
143 | asset.Data); | 143 | asset.Data); |
144 | 144 | ||
145 | m_assetsWritten++; | 145 | m_assetsWritten++; |
146 | |||
147 | //m_log.DebugFormat("[ARCHIVER]: Added asset {0}", m_assetsWritten); | ||
148 | |||
149 | if (m_assetsWritten % LOG_ASSET_LOAD_NOTIFICATION_INTERVAL == 0) | ||
150 | m_log.InfoFormat("[ARCHIVER]: Added {0} assets to archive", m_assetsWritten); | ||
151 | } | 146 | } |
152 | 147 | ||
153 | } | 148 | } |
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs index f29011e..b5b925f 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | |||
@@ -664,7 +664,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
664 | { | 664 | { |
665 | ITerrainLoader terLoader = (ITerrainLoader)Activator.CreateInstance(library.GetType(pluginType.ToString())); | 665 | ITerrainLoader terLoader = (ITerrainLoader)Activator.CreateInstance(library.GetType(pluginType.ToString())); |
666 | m_loaders[terLoader.FileExtension] = terLoader; | 666 | m_loaders[terLoader.FileExtension] = terLoader; |
667 | m_log.Info("L ... " + typeName); | 667 | m_log.Debug("L ... " + typeName); |
668 | } | 668 | } |
669 | } | 669 | } |
670 | catch(AmbiguousMatchException) | 670 | catch(AmbiguousMatchException) |
@@ -680,12 +680,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
680 | if (!m_plugineffects.ContainsKey(pluginName)) | 680 | if (!m_plugineffects.ContainsKey(pluginName)) |
681 | { | 681 | { |
682 | m_plugineffects.Add(pluginName, effect); | 682 | m_plugineffects.Add(pluginName, effect); |
683 | m_log.Info("E ... " + pluginName); | 683 | m_log.Debug("E ... " + pluginName); |
684 | } | 684 | } |
685 | else | 685 | else |
686 | { | 686 | { |
687 | m_plugineffects[pluginName] = effect; | 687 | m_plugineffects[pluginName] = effect; |
688 | m_log.Info("E ... " + pluginName + " (Replaced)"); | 688 | m_log.Debug("E ... " + pluginName + " (Replaced)"); |
689 | } | 689 | } |
690 | } | 690 | } |
691 | } | 691 | } |
diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs index 51faa0e..183b985 100644 --- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs +++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs | |||
@@ -100,7 +100,7 @@ namespace OpenSim.Region.CoreModules | |||
100 | // Register all the Wind Model Plug-ins | 100 | // Register all the Wind Model Plug-ins |
101 | foreach (IWindModelPlugin windPlugin in AddinManager.GetExtensionObjects("/OpenSim/WindModule", false)) | 101 | foreach (IWindModelPlugin windPlugin in AddinManager.GetExtensionObjects("/OpenSim/WindModule", false)) |
102 | { | 102 | { |
103 | m_log.InfoFormat("[WIND] Found Plugin: {0}", windPlugin.Name); | 103 | m_log.DebugFormat("[WIND] Found Plugin: {0}", windPlugin.Name); |
104 | m_availableWindPlugins.Add(windPlugin.Name, windPlugin); | 104 | m_availableWindPlugins.Add(windPlugin.Name, windPlugin); |
105 | } | 105 | } |
106 | 106 | ||
@@ -109,7 +109,7 @@ namespace OpenSim.Region.CoreModules | |||
109 | { | 109 | { |
110 | m_activeWindPlugin = m_availableWindPlugins[m_dWindPluginName]; | 110 | m_activeWindPlugin = m_availableWindPlugins[m_dWindPluginName]; |
111 | 111 | ||
112 | m_log.InfoFormat("[WIND] {0} plugin found, initializing.", m_dWindPluginName); | 112 | m_log.DebugFormat("[WIND] {0} plugin found, initializing.", m_dWindPluginName); |
113 | 113 | ||
114 | if (m_windConfig != null) | 114 | if (m_windConfig != null) |
115 | { | 115 | { |
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 | |||
1691 | UUID copyID = UUID.Random(); | 1691 | UUID copyID = UUID.Random(); |
1692 | bool modrights = Permissions.CanEditObject(part.ParentGroup, remoteClient); | 1692 | bool modrights = Permissions.CanEditObject(part.ParentGroup, remoteClient); |
1693 | part.ParentGroup.AddInventoryItem(remoteClient.AgentId, primLocalID, item, copyID, modrights); | 1693 | part.ParentGroup.AddInventoryItem(remoteClient.AgentId, primLocalID, item, copyID, modrights); |
1694 | m_log.InfoFormat( | 1694 | //// m_log.InfoFormat( |
1695 | "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", | 1695 | //// "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", |
1696 | item.Name, primLocalID, remoteClient.Name); | 1696 | //// item.Name, primLocalID, remoteClient.Name); |
1697 | part.SendPropertiesToClient(remoteClient); | 1697 | part.SendPropertiesToClient(remoteClient); |
1698 | if (!Permissions.BypassPermissions()) | 1698 | if (!Permissions.BypassPermissions()) |
1699 | { | 1699 | { |
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 | |||
1770 | GC.Collect(); | 1770 | GC.Collect(); |
1771 | if (!LoginLock) | 1771 | if (!LoginLock) |
1772 | { | 1772 | { |
1773 | m_sceneGridService.InformNeighborsThatRegionisUp( | ||
1774 | RequestModuleInterface<INeighbourService>(), RegionInfo); | ||
1775 | |||
1773 | if (!StartDisabled) | 1776 | if (!StartDisabled) |
1774 | { | 1777 | { |
1775 | m_log.InfoFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName); | 1778 | m_log.InfoFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName); |
1776 | LoginsEnabled = true; | 1779 | LoginsEnabled = true; |
1777 | } | 1780 | } |
1778 | 1781 | ||
1779 | m_sceneGridService.InformNeighborsThatRegionisUp( | ||
1780 | RequestModuleInterface<INeighbourService>(), RegionInfo); | ||
1781 | |||
1782 | // Region ready should always be set | 1782 | // Region ready should always be set |
1783 | Ready = true; | 1783 | Ready = true; |
1784 | 1784 | ||
@@ -1805,7 +1805,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1805 | } | 1805 | } |
1806 | } | 1806 | } |
1807 | } | 1807 | } |
1808 | else | 1808 | //// else |
1809 | { | 1809 | { |
1810 | // This handles a case of a region having no scripts for the RegionReady module | 1810 | // This handles a case of a region having no scripts for the RegionReady module |
1811 | if (m_sceneGraph.GetActiveScriptsCount() == 0) | 1811 | if (m_sceneGraph.GetActiveScriptsCount() == 0) |
@@ -3716,7 +3716,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3716 | { | 3716 | { |
3717 | isChildAgent = avatar.IsChildAgent; | 3717 | isChildAgent = avatar.IsChildAgent; |
3718 | 3718 | ||
3719 | m_log.DebugFormat( | 3719 | m_log.InfoFormat( |
3720 | "[SCENE]: Removing {0} agent {1} {2} from {3}", | 3720 | "[SCENE]: Removing {0} agent {1} {2} from {3}", |
3721 | isChildAgent ? "child" : "root", avatar.Name, agentID, Name); | 3721 | isChildAgent ? "child" : "root", avatar.Name, agentID, Name); |
3722 | 3722 | ||
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 | |||
88 | 88 | ||
89 | if (neighbour != null) | 89 | if (neighbour != null) |
90 | { | 90 | { |
91 | m_log.DebugFormat("{0} Region {1} successfully informed neighbour {2} at {3}-{4} that it is up", | 91 | m_log.InfoFormat("{0} Region {1} successfully informed neighbour {2} at {3}-{4} that it is up", |
92 | LogHeader, m_scene.Name, neighbour.RegionName, Util.WorldToRegionLoc(x), Util.WorldToRegionLoc(y)); | 92 | LogHeader, m_scene.Name, neighbour.RegionName, Util.WorldToRegionLoc(x), Util.WorldToRegionLoc(y)); |
93 | 93 | ||
94 | m_scene.EventManager.TriggerOnRegionUp(neighbour); | 94 | m_scene.EventManager.TriggerOnRegionUp(neighbour); |
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
131 | } | 131 | } |
132 | } | 132 | } |
133 | 133 | ||
134 | m_log.DebugFormat( | 134 | m_log.InfoFormat( |
135 | "{0} Informing {1} neighbours that region {2} is up", | 135 | "{0} Informing {1} neighbours that region {2} is up", |
136 | LogHeader, onlineNeighbours.Count, m_scene.Name); | 136 | LogHeader, onlineNeighbours.Count, m_scene.Name); |
137 | 137 | ||
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 | |||
176 | i++; | 176 | i++; |
177 | } | 177 | } |
178 | } | 178 | } |
179 | catch (Exception e) | 179 | catch /*(Exception e)*/ |
180 | { | 180 | { |
181 | m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e); | 181 | m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed "); |
182 | Util.LogFailedXML("[COALESCED SCENE OBJECTS SERIALIZER]:", xml); | 182 | //// m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e); |
183 | //// Util.LogFailedXML("[COALESCED SCENE OBJECTS SERIALIZER]:", xml); | ||
183 | return false; | 184 | return false; |
184 | } | 185 | } |
185 | 186 | ||
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 | |||
69 | { | 69 | { |
70 | return FromOriginalXmlFormat(reader); | 70 | return FromOriginalXmlFormat(reader); |
71 | } | 71 | } |
72 | catch (Exception e) | 72 | catch /*(Exception e)*/ |
73 | { | 73 | { |
74 | m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); | 74 | m_log.Error("[SERIALIZER]: Deserialization of xml failed "); |
75 | Util.LogFailedXML("[SERIALIZER]:", fixedData); | 75 | //// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); |
76 | //// Util.LogFailedXML("[SERIALIZER]:", fixedData); | ||
76 | return null; | 77 | return null; |
77 | } | 78 | } |
78 | } | 79 | } |
@@ -307,10 +308,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
307 | // sceneObject.AggregatePerms(); | 308 | // sceneObject.AggregatePerms(); |
308 | return sceneObject; | 309 | return sceneObject; |
309 | } | 310 | } |
310 | catch (Exception e) | 311 | catch /*(Exception e)*/ |
311 | { | 312 | { |
312 | m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); | 313 | m_log.Error("[SERIALIZER]: Deserialization of xml failed "); |
313 | Util.LogFailedXML("[SERIALIZER]:", xmlData); | 314 | //// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); |
315 | //// Util.LogFailedXML("[SERIALIZER]:", xmlData); | ||
314 | return null; | 316 | return null; |
315 | } | 317 | } |
316 | } | 318 | } |
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 | |||
573 | { | 573 | { |
574 | string xml = Utils.BytesToString(sceneObjectAsset.Data); | 574 | string xml = Utils.BytesToString(sceneObjectAsset.Data); |
575 | 575 | ||
576 | CoalescedSceneObjects coa; | 576 | if (String.IsNullOrEmpty(xml)) |
577 | if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa)) | 577 | m_log.ErrorFormat("[UUIDGatherer]: Asset {0} - {1} has a zero length XML blob!", sceneObjectAsset.Name, sceneObjectAsset.ID); |
578 | { | ||
579 | foreach (SceneObjectGroup sog in coa.Objects) | ||
580 | AddForInspection(sog); | ||
581 | } | ||
582 | else | 578 | else |
583 | { | 579 | { |
584 | SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml); | 580 | CoalescedSceneObjects coa; |
581 | if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa)) | ||
582 | { | ||
583 | foreach (SceneObjectGroup sog in coa.Objects) | ||
584 | AddForInspection(sog); | ||
585 | } | ||
586 | else | ||
587 | { | ||
588 | SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml); | ||
585 | 589 | ||
586 | if (null != sog) | 590 | if (null != sog) |
587 | AddForInspection(sog); | 591 | AddForInspection(sog); |
592 | } | ||
588 | } | 593 | } |
589 | } | 594 | } |
590 | 595 | ||
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs index 988ada1..135901a 100644 --- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | |||
@@ -239,8 +239,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady | |||
239 | m_log.InfoFormat("[RegionReady]: INITIALIZATION COMPLETE FOR {0}", m_scene.Name); | 239 | m_log.InfoFormat("[RegionReady]: INITIALIZATION COMPLETE FOR {0}", m_scene.Name); |
240 | } | 240 | } |
241 | 241 | ||
242 | m_scene.SceneGridService.InformNeighborsThatRegionisUp( | 242 | //// Scene.cs already does this. |
243 | m_scene.RequestModuleInterface<INeighbourService>(), m_scene.RegionInfo); | 243 | //// m_scene.SceneGridService.InformNeighborsThatRegionisUp( |
244 | //// m_scene.RequestModuleInterface<INeighbourService>(), m_scene.RegionInfo); | ||
244 | 245 | ||
245 | if (m_uri != string.Empty) | 246 | if (m_uri != string.Empty) |
246 | { | 247 | { |