diff options
author | BlueWall | 2012-12-07 15:36:43 -0500 |
---|---|---|
committer | BlueWall | 2012-12-07 15:36:43 -0500 |
commit | 0b455d2882a51ce0841d003f12d4c35ad9edb753 (patch) | |
tree | c48c95f48786f8fe435fc5c90477ac3b7c9eaf6c /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Merge branch 'master' into connector_plugin (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.zip opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.gz opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.bz2 opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.xz |
Merge branch 'master' into connector_plugin
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 1ad5edd..cca295c 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -5638,10 +5638,17 @@ namespace OpenSim.Region.Framework.Scenes | |||
5638 | return m_SpawnPoint - 1; | 5638 | return m_SpawnPoint - 1; |
5639 | } | 5639 | } |
5640 | 5640 | ||
5641 | // Wrappers to get physics modules retrieve assets. Has to be done this way | 5641 | /// <summary> |
5642 | // because we can't assign the asset service to physics directly - at the | 5642 | /// Wrappers to get physics modules retrieve assets. |
5643 | // time physics are instantiated it's not registered but it will be by | 5643 | /// </summary> |
5644 | // the time the first prim exists. | 5644 | /// <remarks> |
5645 | /// Has to be done this way | ||
5646 | /// because we can't assign the asset service to physics directly - at the | ||
5647 | /// time physics are instantiated it's not registered but it will be by | ||
5648 | /// the time the first prim exists. | ||
5649 | /// </remarks> | ||
5650 | /// <param name="assetID"></param> | ||
5651 | /// <param name="callback"></param> | ||
5645 | public void PhysicsRequestAsset(UUID assetID, AssetReceivedDelegate callback) | 5652 | public void PhysicsRequestAsset(UUID assetID, AssetReceivedDelegate callback) |
5646 | { | 5653 | { |
5647 | AssetService.Get(assetID.ToString(), callback, PhysicsAssetReceived); | 5654 | AssetService.Get(assetID.ToString(), callback, PhysicsAssetReceived); |