aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2012-10-30 23:14:06 +0000
committerMelanie2012-10-30 23:14:06 +0000
commit3388534ff5ca91fab6415fb0ba723ae088a04971 (patch)
tree60b3ac027b59feaf4edd85e2bb0662524b9a41e0
parentStore and send the current movement animation state to a new sim on crossing (diff)
parentOnly create a new list to check if objects have reached targets if there actu... (diff)
downloadopensim-SC_OLD-3388534ff5ca91fab6415fb0ba723ae088a04971.zip
opensim-SC_OLD-3388534ff5ca91fab6415fb0ba723ae088a04971.tar.gz
opensim-SC_OLD-3388534ff5ca91fab6415fb0ba723ae088a04971.tar.bz2
opensim-SC_OLD-3388534ff5ca91fab6415fb0ba723ae088a04971.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs14
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs8
-rw-r--r--OpenSim/Services/Interfaces/IAssetService.cs6
3 files changed, 21 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 7d8cbf5..69c1027 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1692,15 +1692,19 @@ namespace OpenSim.Region.Framework.Scenes
1692 1692
1693 private void CheckAtTargets() 1693 private void CheckAtTargets()
1694 { 1694 {
1695 List<SceneObjectGroup> objs = new List<SceneObjectGroup>(); 1695 List<SceneObjectGroup> objs = null;
1696
1696 lock (m_groupsWithTargets) 1697 lock (m_groupsWithTargets)
1697 { 1698 {
1698 foreach (SceneObjectGroup grp in m_groupsWithTargets.Values) 1699 if (m_groupsWithTargets.Count != 0)
1699 objs.Add(grp); 1700 objs = new List<SceneObjectGroup>(m_groupsWithTargets.Values);
1700 } 1701 }
1701 1702
1702 foreach (SceneObjectGroup entry in objs) 1703 if (objs != null)
1703 entry.checkAtTargets(); 1704 {
1705 foreach (SceneObjectGroup entry in objs)
1706 entry.checkAtTargets();
1707 }
1704 } 1708 }
1705 1709
1706 /// <summary> 1710 /// <summary>
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 5b49e3b..5a0b8d1 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -3351,7 +3351,7 @@ Console.WriteLine(" JointCreateFixed");
3351 3351
3352 private void MeshAssetReceived(AssetBase asset) 3352 private void MeshAssetReceived(AssetBase asset)
3353 { 3353 {
3354 if (asset.Data != null && asset.Data.Length > 0) 3354 if (asset != null && asset.Data != null && asset.Data.Length > 0)
3355 { 3355 {
3356 if (!_pbs.SculptEntry) 3356 if (!_pbs.SculptEntry)
3357 return; 3357 return;
@@ -3364,6 +3364,12 @@ Console.WriteLine(" JointCreateFixed");
3364 m_taintshape = true; 3364 m_taintshape = true;
3365 _parent_scene.AddPhysicsActorTaint(this); 3365 _parent_scene.AddPhysicsActorTaint(this);
3366 } 3366 }
3367 else
3368 {
3369 m_log.WarnFormat(
3370 "[ODE PRIM]: Could not get mesh/sculpt asset {0} for {1} at {2} in {3}",
3371 _pbs.SculptTexture, Name, _position, _parent_scene.Name);
3372 }
3367 } 3373 }
3368 } 3374 }
3369} \ No newline at end of file 3375} \ No newline at end of file
diff --git a/OpenSim/Services/Interfaces/IAssetService.cs b/OpenSim/Services/Interfaces/IAssetService.cs
index 80494f1..3c469c6 100644
--- a/OpenSim/Services/Interfaces/IAssetService.cs
+++ b/OpenSim/Services/Interfaces/IAssetService.cs
@@ -68,7 +68,11 @@ namespace OpenSim.Services.Interfaces
68 /// </summary> 68 /// </summary>
69 /// <param name="id">The asset id</param> 69 /// <param name="id">The asset id</param>
70 /// <param name="sender">Represents the requester. Passed back via the handler</param> 70 /// <param name="sender">Represents the requester. Passed back via the handler</param>
71 /// <param name="handler">The handler to call back once the asset has been retrieved</param> 71 /// <param name="handler">
72 /// The handler to call back once the asset has been retrieved. This will be called back with a null AssetBase
73 /// if the asset could not be found for some reason (e.g. if it does not exist, if a remote asset service
74 /// was not contactable, if it is not in the database, etc.).
75 /// </param>
72 /// <returns>True if the id was parseable, false otherwise</returns> 76 /// <returns>True if the id was parseable, false otherwise</returns>
73 bool Get(string id, Object sender, AssetRetrieved handler); 77 bool Get(string id, Object sender, AssetRetrieved handler);
74 78