diff options
| author | Melanie | 2010-02-02 03:56:29 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-02 03:56:29 +0000 |
| commit | d5ed92cf3892c507a31da587deb394e8d5842ed6 (patch) | |
| tree | 270646e8dbf76aec39b83cc77a551ecf9e43f011 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Small fix for a spurious exception (diff) | |
| parent | Revert "improve locking of m_items in SceneObjectPartInventory" (diff) | |
| download | opensim-SC-d5ed92cf3892c507a31da587deb394e8d5842ed6.zip opensim-SC-d5ed92cf3892c507a31da587deb394e8d5842ed6.tar.gz opensim-SC-d5ed92cf3892c507a31da587deb394e8d5842ed6.tar.bz2 opensim-SC-d5ed92cf3892c507a31da587deb394e8d5842ed6.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 23db482..d2f33b0 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2702,6 +2702,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2702 | client.OnRequestObjectPropertiesFamily += m_sceneGraph.RequestObjectPropertiesFamily; | 2702 | client.OnRequestObjectPropertiesFamily += m_sceneGraph.RequestObjectPropertiesFamily; |
| 2703 | client.OnObjectPermissions += HandleObjectPermissionsUpdate; | 2703 | client.OnObjectPermissions += HandleObjectPermissionsUpdate; |
| 2704 | client.OnGrabObject += ProcessObjectGrab; | 2704 | client.OnGrabObject += ProcessObjectGrab; |
| 2705 | client.OnGrabUpdate += ProcessObjectGrabUpdate; | ||
| 2705 | client.OnDeGrabObject += ProcessObjectDeGrab; | 2706 | client.OnDeGrabObject += ProcessObjectDeGrab; |
| 2706 | client.OnUndo += m_sceneGraph.HandleUndo; | 2707 | client.OnUndo += m_sceneGraph.HandleUndo; |
| 2707 | client.OnObjectDescription += m_sceneGraph.PrimDescription; | 2708 | client.OnObjectDescription += m_sceneGraph.PrimDescription; |