diff options
| author | Kitto Flora | 2010-05-07 15:16:59 -0400 |
|---|---|---|
| committer | Kitto Flora | 2010-05-07 15:16:59 -0400 |
| commit | bc7d84b75c8443b82301717ceb603d6c1fbee931 (patch) | |
| tree | bceb1bf07c14dd75d4508a1c93e5271dfff183c7 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Fix Mouse+WASD makes Av rise; Fix PREJUMP. (diff) | |
| parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
| download | opensim-SC_OLD-bc7d84b75c8443b82301717ceb603d6c1fbee931.zip opensim-SC_OLD-bc7d84b75c8443b82301717ceb603d6c1fbee931.tar.gz opensim-SC_OLD-bc7d84b75c8443b82301717ceb603d6c1fbee931.tar.bz2 opensim-SC_OLD-bc7d84b75c8443b82301717ceb603d6c1fbee931.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/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 665fb4c..ee097bc 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; |