diff options
| author | Melanie | 2011-11-28 11:21:15 +0100 |
|---|---|---|
| committer | Melanie | 2011-11-28 11:21:15 +0100 |
| commit | 80148bf7844690baf0f70226627bd42e6501f125 (patch) | |
| tree | 7632978d49f16a84c1cf3b4d9cec6dcc715e0750 /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps | |
| parent | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge (diff) | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| download | opensim-SC-80148bf7844690baf0f70226627bd42e6501f125.zip opensim-SC-80148bf7844690baf0f70226627bd42e6501f125.tar.gz opensim-SC-80148bf7844690baf0f70226627bd42e6501f125.tar.bz2 opensim-SC-80148bf7844690baf0f70226627bd42e6501f125.tar.xz | |
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
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 b93a41b..8f0ae76 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
| @@ -134,7 +134,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 134 | AddNewInventoryItem = m_Scene.AddUploadedInventoryItem; | 134 | AddNewInventoryItem = m_Scene.AddUploadedInventoryItem; |
| 135 | ItemUpdatedCall = m_Scene.CapsUpdateInventoryItemAsset; | 135 | ItemUpdatedCall = m_Scene.CapsUpdateInventoryItemAsset; |
| 136 | TaskScriptUpdatedCall = m_Scene.CapsUpdateTaskInventoryScriptAsset; | 136 | TaskScriptUpdatedCall = m_Scene.CapsUpdateTaskInventoryScriptAsset; |
| 137 | CAPSFetchInventoryDescendents = m_Scene.HandleFetchInventoryDescendentsCAPS; | ||
| 138 | GetClient = m_Scene.SceneGraph.GetControllingClient; | 137 | GetClient = m_Scene.SceneGraph.GetControllingClient; |
| 139 | } | 138 | } |
| 140 | 139 | ||