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

Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

integration
Melanie 2012-10-30 23:14:06 +00:00
parent fd9cb3cb68 984faf24df
commit 3388534ff5
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1692,15 +1692,19 @@ namespace OpenSim.Region.Framework.Scenes
private void CheckAtTargets()
{
List<SceneObjectGroup> objs = new List<SceneObjectGroup>();
List<SceneObjectGroup> objs = null;
lock (m_groupsWithTargets)
{
foreach (SceneObjectGroup grp in m_groupsWithTargets.Values)
objs.Add(grp);
if (m_groupsWithTargets.Count != 0)
objs = new List<SceneObjectGroup>(m_groupsWithTargets.Values);
}
foreach (SceneObjectGroup entry in objs)
entry.checkAtTargets();
if (objs != null)
{
foreach (SceneObjectGroup entry in objs)
entry.checkAtTargets();
}
}
/// <summary>

8
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
View File

@ -3351,7 +3351,7 @@ Console.WriteLine(" JointCreateFixed");
private void MeshAssetReceived(AssetBase asset)
{
if (asset.Data != null && asset.Data.Length > 0)
if (asset != null && asset.Data != null && asset.Data.Length > 0)
{
if (!_pbs.SculptEntry)
return;
@ -3364,6 +3364,12 @@ Console.WriteLine(" JointCreateFixed");
m_taintshape = true;
_parent_scene.AddPhysicsActorTaint(this);
}
else
{
m_log.WarnFormat(
"[ODE PRIM]: Could not get mesh/sculpt asset {0} for {1} at {2} in {3}",
_pbs.SculptTexture, Name, _position, _parent_scene.Name);
}
}
}
}

6
OpenSim/Services/Interfaces/IAssetService.cs
View File

@ -68,7 +68,11 @@ namespace OpenSim.Services.Interfaces
/// </summary>
/// <param name="id">The asset id</param>
/// <param name="sender">Represents the requester. Passed back via the handler</param>
/// <param name="handler">The handler to call back once the asset has been retrieved</param>
/// <param name="handler">
/// The handler to call back once the asset has been retrieved. This will be called back with a null AssetBase
/// if the asset could not be found for some reason (e.g. if it does not exist, if a remote asset service
/// was not contactable, if it is not in the database, etc.).
/// </param>
/// <returns>True if the id was parseable, false otherwise</returns>
bool Get(string id, Object sender, AssetRetrieved handler);