OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into bigmerge 

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
avinationmerge
Melanie 2011-11-06 20:12:57 +00:00
parent 89a1d7c37c fa992a020c
commit 51bad0f8ae
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -3310,7 +3310,11 @@ namespace OpenSim.Region.Framework.Scenes
} }
deleteIDs.Add(localID); deleteIDs.Add(localID);
} }
ForEachClient(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, deleteIDs); });
ForEachClient(delegate(IClientAPI client)
{
client.SendKillObject(m_regionHandle, deleteIDs);
});
} }
#endregion #endregion

5
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -774,7 +774,10 @@ namespace OpenSim.Region.Framework.Scenes
m_localId = m_scene.AllocateLocalId(); m_localId = m_scene.AllocateLocalId();
UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, m_uuid); UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, m_uuid);
m_userFlags = account.UserFlags; if (account != null)
m_userFlags = account.UserFlags;
else
m_userFlags = 0;
if (account != null) if (account != null)
UserLevel = account.UserLevel; UserLevel = account.UserLevel;

10
OpenSim/Services/AssetService/AssetService.cs
View File

@ -117,7 +117,15 @@ namespace OpenSim.Services.AssetService
return null; return null;
} }
return m_Database.GetAsset(assetID); try
{
return m_Database.GetAsset(assetID);
}
catch (Exception e)
{
m_log.ErrorFormat("[ASSET SERVICE]: Exception getting asset {0} {1}", assetID, e);
return null;
}
} }
public virtual AssetBase GetCached(string id) public virtual AssetBase GetCached(string id)