aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 2237922..64c443d 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1737,14 +1737,14 @@ namespace OpenSim.Region.Environment.Scenes
1737 Caps cap = 1737 Caps cap =
1738 new Caps(AssetCache, m_httpListener, m_regInfo.ExternalHostName, m_httpListener.Port, 1738 new Caps(AssetCache, m_httpListener, m_regInfo.ExternalHostName, m_httpListener.Port,
1739 capsObjectPath, agentId, m_dumpAssetsToFile); 1739 capsObjectPath, agentId, m_dumpAssetsToFile);
1740
1741 cap.RegisterHandlers(); 1740 cap.RegisterHandlers();
1741
1742 EventManager.TriggerOnRegisterCaps(agentId, cap);
1742 1743
1743 cap.AddNewInventoryItem = AddInventoryItem; 1744 cap.AddNewInventoryItem = AddInventoryItem;
1744 cap.ItemUpdatedCall = CapsUpdateInventoryItemAsset; 1745 cap.ItemUpdatedCall = CapsUpdateInventoryItemAsset;
1745 cap.TaskScriptUpdatedCall = CapsUpdateTaskInventoryScriptAsset; 1746 cap.TaskScriptUpdatedCall = CapsUpdateTaskInventoryScriptAsset;
1746 cap.CAPSFetchInventoryDescendents = CommsManager.UserProfileCacheService.HandleFetchInventoryDescendentsCAPS; 1747 cap.CAPSFetchInventoryDescendents = CommsManager.UserProfileCacheService.HandleFetchInventoryDescendentsCAPS;
1747 cap.CAPSGetUserDetails = CommsManager.UserProfileCacheService.GetUserDetails;
1748 1748
1749 m_capsHandlers[agentId] = cap; 1749 m_capsHandlers[agentId] = cap;
1750 } 1750 }
@@ -1764,6 +1764,8 @@ namespace OpenSim.Region.Environment.Scenes
1764 agentId, RegionInfo.RegionName); 1764 agentId, RegionInfo.RegionName);
1765 1765
1766 m_capsHandlers[agentId].DeregisterHandlers(); 1766 m_capsHandlers[agentId].DeregisterHandlers();
1767 EventManager.TriggerOnDeregisterCaps(agentId, m_capsHandlers[agentId]);
1768
1767 m_capsHandlers.Remove(agentId); 1769 m_capsHandlers.Remove(agentId);
1768 } 1770 }
1769 else 1771 else