diff options
| author | Melanie | 2010-04-30 11:48:57 +0100 |
|---|---|---|
| committer | Melanie | 2010-04-30 11:48:57 +0100 |
| commit | 8b70477556a5467868bf6b771da8bb5a366f3160 (patch) | |
| tree | f44e1e120072848270abc38e9eee374b2d5792c0 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Fix Av jump motion S/W (diff) | |
| parent | Fix link security issue (diff) | |
| download | opensim-SC-8b70477556a5467868bf6b771da8bb5a366f3160.zip opensim-SC-8b70477556a5467868bf6b771da8bb5a366f3160.tar.gz opensim-SC-8b70477556a5467868bf6b771da8bb5a366f3160.tar.bz2 opensim-SC-8b70477556a5467868bf6b771da8bb5a366f3160.tar.xz | |
Merge branch '0.6.9-post-fixes' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index db073e8..0556166 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2762,8 +2762,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2762 | client.OnObjectName += m_sceneGraph.PrimName; | 2762 | client.OnObjectName += m_sceneGraph.PrimName; |
| 2763 | client.OnObjectClickAction += m_sceneGraph.PrimClickAction; | 2763 | client.OnObjectClickAction += m_sceneGraph.PrimClickAction; |
| 2764 | client.OnObjectMaterial += m_sceneGraph.PrimMaterial; | 2764 | client.OnObjectMaterial += m_sceneGraph.PrimMaterial; |
| 2765 | client.OnLinkObjects += m_sceneGraph.LinkObjects; | 2765 | client.OnLinkObjects += LinkObjects; |
| 2766 | client.OnDelinkObjects += m_sceneGraph.DelinkObjects; | 2766 | client.OnDelinkObjects += DelinkObjects; |
| 2767 | client.OnObjectDuplicate += m_sceneGraph.DuplicateObject; | 2767 | client.OnObjectDuplicate += m_sceneGraph.DuplicateObject; |
| 2768 | client.OnObjectDuplicateOnRay += doObjectDuplicateOnRay; | 2768 | client.OnObjectDuplicateOnRay += doObjectDuplicateOnRay; |
| 2769 | client.OnUpdatePrimFlags += m_sceneGraph.UpdatePrimFlags; | 2769 | client.OnUpdatePrimFlags += m_sceneGraph.UpdatePrimFlags; |
| @@ -2918,8 +2918,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2918 | client.OnObjectName -= m_sceneGraph.PrimName; | 2918 | client.OnObjectName -= m_sceneGraph.PrimName; |
| 2919 | client.OnObjectClickAction -= m_sceneGraph.PrimClickAction; | 2919 | client.OnObjectClickAction -= m_sceneGraph.PrimClickAction; |
| 2920 | client.OnObjectMaterial -= m_sceneGraph.PrimMaterial; | 2920 | client.OnObjectMaterial -= m_sceneGraph.PrimMaterial; |
| 2921 | client.OnLinkObjects -= m_sceneGraph.LinkObjects; | 2921 | client.OnLinkObjects -= LinkObjects; |
| 2922 | client.OnDelinkObjects -= m_sceneGraph.DelinkObjects; | 2922 | client.OnDelinkObjects -= DelinkObjects; |
| 2923 | client.OnObjectDuplicate -= m_sceneGraph.DuplicateObject; | 2923 | client.OnObjectDuplicate -= m_sceneGraph.DuplicateObject; |
| 2924 | client.OnObjectDuplicateOnRay -= doObjectDuplicateOnRay; | 2924 | client.OnObjectDuplicateOnRay -= doObjectDuplicateOnRay; |
| 2925 | client.OnUpdatePrimFlags -= m_sceneGraph.UpdatePrimFlags; | 2925 | client.OnUpdatePrimFlags -= m_sceneGraph.UpdatePrimFlags; |