diff options
| author | Mic Bowman | 2011-08-30 08:44:28 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-08-30 08:44:28 -0700 |
| commit | 17dab7245fd3f132264fb4ae5e8e70ebdbde073b (patch) | |
| tree | 4099256b83c94e9c568c316431ebc92a32a85241 /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps | |
| parent | Use GetMeshKey from PrimitiveBaseShape. (diff) | |
| parent | Fix bug in persisting saved appearances for npcs (diff) | |
| download | opensim-SC-17dab7245fd3f132264fb4ae5e8e70ebdbde073b.zip opensim-SC-17dab7245fd3f132264fb4ae5e8e70ebdbde073b.tar.gz opensim-SC-17dab7245fd3f132264fb4ae5e8e70ebdbde073b.tar.bz2 opensim-SC-17dab7245fd3f132264fb4ae5e8e70ebdbde073b.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index ff889ea..d1ce5df 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
| @@ -136,7 +136,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 136 | TaskScriptUpdatedCall = m_Scene.CapsUpdateTaskInventoryScriptAsset; | 136 | TaskScriptUpdatedCall = m_Scene.CapsUpdateTaskInventoryScriptAsset; |
| 137 | CAPSFetchInventoryDescendents = m_Scene.HandleFetchInventoryDescendentsCAPS; | 137 | CAPSFetchInventoryDescendents = m_Scene.HandleFetchInventoryDescendentsCAPS; |
| 138 | GetClient = m_Scene.SceneContents.GetControllingClient; | 138 | GetClient = m_Scene.SceneContents.GetControllingClient; |
| 139 | |||
| 140 | } | 139 | } |
| 141 | 140 | ||
| 142 | /// <summary> | 141 | /// <summary> |