Merge branch 'master' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/Scene.csavinationmerge
commit
51bad0f8ae
|
@ -3310,7 +3310,11 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
}
|
||||
deleteIDs.Add(localID);
|
||||
}
|
||||
ForEachClient(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, deleteIDs); });
|
||||
|
||||
ForEachClient(delegate(IClientAPI client)
|
||||
{
|
||||
client.SendKillObject(m_regionHandle, deleteIDs);
|
||||
});
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
|
|
@ -774,7 +774,10 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
m_localId = m_scene.AllocateLocalId();
|
||||
|
||||
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)
|
||||
UserLevel = account.UserLevel;
|
||||
|
|
|
@ -117,7 +117,15 @@ namespace OpenSim.Services.AssetService
|
|||
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)
|
||||
|
|
Loading…
Reference in New Issue