Merge branch 'careminster' into careminster-presence-refactor

author: Melanie 2010-04-30 11:49:16 +0100
committer: Melanie 2010-04-30 11:49:16 +0100
commit: 7dc5ebc9290cc78babee6032b0d1606d6a7848cf (patch)
tree: 284b6ac7d547fcc4357343336d5fc66076e6085d /OpenSim/Region/Framework/Scenes/Scene.cs
parent: Treat a UserLevel of -1 as an unverified account and refer them to their (diff)
parent: Merge branch '0.6.9-post-fixes' into careminster (diff)
download: opensim-SC_OLD-7dc5ebc9290cc78babee6032b0d1606d6a7848cf.zip
opensim-SC_OLD-7dc5ebc9290cc78babee6032b0d1606d6a7848cf.tar.gz
opensim-SC_OLD-7dc5ebc9290cc78babee6032b0d1606d6a7848cf.tar.bz2
opensim-SC_OLD-7dc5ebc9290cc78babee6032b0d1606d6a7848cf.tar.xz
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 58f890f..8ceb109 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2749,8 +2749,8 @@ namespace OpenSim.Region.Framework.Scenes
            client.OnObjectName += m_sceneGraph.PrimName;
            client.OnObjectClickAction += m_sceneGraph.PrimClickAction;
            client.OnObjectMaterial += m_sceneGraph.PrimMaterial;
-            client.OnLinkObjects += m_sceneGraph.LinkObjects;
+            client.OnLinkObjects += LinkObjects;
-            client.OnDelinkObjects += m_sceneGraph.DelinkObjects;
+            client.OnDelinkObjects += DelinkObjects;
            client.OnObjectDuplicate += m_sceneGraph.DuplicateObject;
            client.OnObjectDuplicateOnRay += doObjectDuplicateOnRay;
            client.OnUpdatePrimFlags += m_sceneGraph.UpdatePrimFlags;
@@ -2906,8 +2906,8 @@ namespace OpenSim.Region.Framework.Scenes
            client.OnObjectName -= m_sceneGraph.PrimName;
            client.OnObjectClickAction -= m_sceneGraph.PrimClickAction;
            client.OnObjectMaterial -= m_sceneGraph.PrimMaterial;
-            client.OnLinkObjects -= m_sceneGraph.LinkObjects;
+            client.OnLinkObjects -= LinkObjects;
-            client.OnDelinkObjects -= m_sceneGraph.DelinkObjects;
+            client.OnDelinkObjects -= DelinkObjects;
            client.OnObjectDuplicate -= m_sceneGraph.DuplicateObject;
            client.OnObjectDuplicateOnRay -= doObjectDuplicateOnRay;
            client.OnUpdatePrimFlags -= m_sceneGraph.UpdatePrimFlags;
author	Melanie	2010-04-30 11:49:16 +0100
committer	Melanie	2010-04-30 11:49:16 +0100
commit	7dc5ebc9290cc78babee6032b0d1606d6a7848cf (patch)
tree	284b6ac7d547fcc4357343336d5fc66076e6085d /OpenSim/Region/Framework/Scenes/Scene.cs
parent	Treat a UserLevel of -1 as an unverified account and refer them to their (diff)
parent	Merge branch '0.6.9-post-fixes' into careminster (diff)
download	opensim-SC_OLD-7dc5ebc9290cc78babee6032b0d1606d6a7848cf.zip opensim-SC_OLD-7dc5ebc9290cc78babee6032b0d1606d6a7848cf.tar.gz opensim-SC_OLD-7dc5ebc9290cc78babee6032b0d1606d6a7848cf.tar.bz2 opensim-SC_OLD-7dc5ebc9290cc78babee6032b0d1606d6a7848cf.tar.xz

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 58f890f..8ceb109 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2749,8 +2749,8 @@ namespace OpenSim.Region.Framework.Scenes
2749	client.OnObjectName += m_sceneGraph.PrimName;	2749	client.OnObjectName += m_sceneGraph.PrimName;
2750	client.OnObjectClickAction += m_sceneGraph.PrimClickAction;	2750	client.OnObjectClickAction += m_sceneGraph.PrimClickAction;
2751	client.OnObjectMaterial += m_sceneGraph.PrimMaterial;	2751	client.OnObjectMaterial += m_sceneGraph.PrimMaterial;
2752	client.OnLinkObjects += m_sceneGraph.LinkObjects;	2752	client.OnLinkObjects += LinkObjects;
2753	client.OnDelinkObjects += m_sceneGraph.DelinkObjects;	2753	client.OnDelinkObjects += DelinkObjects;
2754	client.OnObjectDuplicate += m_sceneGraph.DuplicateObject;	2754	client.OnObjectDuplicate += m_sceneGraph.DuplicateObject;
2755	client.OnObjectDuplicateOnRay += doObjectDuplicateOnRay;	2755	client.OnObjectDuplicateOnRay += doObjectDuplicateOnRay;
2756	client.OnUpdatePrimFlags += m_sceneGraph.UpdatePrimFlags;	2756	client.OnUpdatePrimFlags += m_sceneGraph.UpdatePrimFlags;
@@ -2906,8 +2906,8 @@ namespace OpenSim.Region.Framework.Scenes
2906	client.OnObjectName -= m_sceneGraph.PrimName;	2906	client.OnObjectName -= m_sceneGraph.PrimName;
2907	client.OnObjectClickAction -= m_sceneGraph.PrimClickAction;	2907	client.OnObjectClickAction -= m_sceneGraph.PrimClickAction;
2908	client.OnObjectMaterial -= m_sceneGraph.PrimMaterial;	2908	client.OnObjectMaterial -= m_sceneGraph.PrimMaterial;
2909	client.OnLinkObjects -= m_sceneGraph.LinkObjects;	2909	client.OnLinkObjects -= LinkObjects;
2910	client.OnDelinkObjects -= m_sceneGraph.DelinkObjects;	2910	client.OnDelinkObjects -= DelinkObjects;
2911	client.OnObjectDuplicate -= m_sceneGraph.DuplicateObject;	2911	client.OnObjectDuplicate -= m_sceneGraph.DuplicateObject;
2912	client.OnObjectDuplicateOnRay -= doObjectDuplicateOnRay;	2912	client.OnObjectDuplicateOnRay -= doObjectDuplicateOnRay;
2913	client.OnUpdatePrimFlags -= m_sceneGraph.UpdatePrimFlags;	2913	client.OnUpdatePrimFlags -= m_sceneGraph.UpdatePrimFlags;