ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

avoid some broken object assets present in osgrid inventories due to past problems, etc

Browse Source
This commit is contained in:
UbitUmarov
2017-06-21 21:38:12 +01:00
parent 1bfe4da378
commit 11d3860781
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Framework/Scenes/UuidGatherer.cs
View File

@@ -142,6 +142,8 @@ namespace OpenSim.Region.Framework.Scenes
{
// m_log.DebugFormat(
// "[ASSET GATHERER]: Getting assets for object {0}, {1}", sceneObject.Name, sceneObject.UUID);
if(sceneObject.IsDeleted)
return;
SceneObjectPart[] parts = sceneObject.Parts;
for (int i = 0; i < parts.Length; i++)
@@ -489,6 +491,13 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="sceneObjectAsset"></param>
private void RecordSceneObjectAssetUuids(AssetBase sceneObjectAsset)
{
if(sceneObjectAsset.Data == null || sceneObjectAsset.Data.Length == 0)
{
m_log.WarnFormat("[UUIDgatherer] Error: object asset '{0}' id: {1} has no data",
sceneObjectAsset.Name,sceneObjectAsset.ID.ToString());
return;
}
string xml = Utils.BytesToString(sceneObjectAsset.Data);
CoalescedSceneObjects coa;