diff options
| author | Justin Clark-Casey (justincc) | 2010-04-30 17:54:00 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-04-30 17:54:00 +0100 |
| commit | 89e79c11335d55ae8131d6fa92218bf387e6c48e (patch) | |
| tree | bb96e1093123b21e41f52e61000398f82f83f23b /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | rename SQLiteNG to SQLite and SQLite to SQLiteLegacy (diff) | |
| parent | Fix some symbol errors (diff) | |
| download | opensim-SC_OLD-89e79c11335d55ae8131d6fa92218bf387e6c48e.zip opensim-SC_OLD-89e79c11335d55ae8131d6fa92218bf387e6c48e.tar.gz opensim-SC_OLD-89e79c11335d55ae8131d6fa92218bf387e6c48e.tar.bz2 opensim-SC_OLD-89e79c11335d55ae8131d6fa92218bf387e6c48e.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
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 57587be..61a2956 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2721,8 +2721,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2721 | client.OnObjectName += m_sceneGraph.PrimName; | 2721 | client.OnObjectName += m_sceneGraph.PrimName; |
| 2722 | client.OnObjectClickAction += m_sceneGraph.PrimClickAction; | 2722 | client.OnObjectClickAction += m_sceneGraph.PrimClickAction; |
| 2723 | client.OnObjectMaterial += m_sceneGraph.PrimMaterial; | 2723 | client.OnObjectMaterial += m_sceneGraph.PrimMaterial; |
| 2724 | client.OnLinkObjects += m_sceneGraph.LinkObjects; | 2724 | client.OnLinkObjects += LinkObjects; |
| 2725 | client.OnDelinkObjects += m_sceneGraph.DelinkObjects; | 2725 | client.OnDelinkObjects += DelinkObjects; |
| 2726 | client.OnObjectDuplicate += m_sceneGraph.DuplicateObject; | 2726 | client.OnObjectDuplicate += m_sceneGraph.DuplicateObject; |
| 2727 | client.OnObjectDuplicateOnRay += doObjectDuplicateOnRay; | 2727 | client.OnObjectDuplicateOnRay += doObjectDuplicateOnRay; |
| 2728 | client.OnUpdatePrimFlags += m_sceneGraph.UpdatePrimFlags; | 2728 | client.OnUpdatePrimFlags += m_sceneGraph.UpdatePrimFlags; |
| @@ -2878,8 +2878,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2878 | client.OnObjectName -= m_sceneGraph.PrimName; | 2878 | client.OnObjectName -= m_sceneGraph.PrimName; |
| 2879 | client.OnObjectClickAction -= m_sceneGraph.PrimClickAction; | 2879 | client.OnObjectClickAction -= m_sceneGraph.PrimClickAction; |
| 2880 | client.OnObjectMaterial -= m_sceneGraph.PrimMaterial; | 2880 | client.OnObjectMaterial -= m_sceneGraph.PrimMaterial; |
| 2881 | client.OnLinkObjects -= m_sceneGraph.LinkObjects; | 2881 | client.OnLinkObjects -= LinkObjects; |
| 2882 | client.OnDelinkObjects -= m_sceneGraph.DelinkObjects; | 2882 | client.OnDelinkObjects -= DelinkObjects; |
| 2883 | client.OnObjectDuplicate -= m_sceneGraph.DuplicateObject; | 2883 | client.OnObjectDuplicate -= m_sceneGraph.DuplicateObject; |
| 2884 | client.OnObjectDuplicateOnRay -= doObjectDuplicateOnRay; | 2884 | client.OnObjectDuplicateOnRay -= doObjectDuplicateOnRay; |
| 2885 | client.OnUpdatePrimFlags -= m_sceneGraph.UpdatePrimFlags; | 2885 | client.OnUpdatePrimFlags -= m_sceneGraph.UpdatePrimFlags; |