aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorDiva Canto2009-08-16 08:59:58 -0700
committerDiva Canto2009-08-16 08:59:58 -0700
commit6808b9109e33a111e3655ae214cd7b80ef3346f4 (patch)
tree02cddcbd4d6676dfc4840863e498943986b19c47 /OpenSim/Region/Framework/Scenes/Scene.cs
parentMerge branch 'master' into inventory-connector (diff)
parent* Implements ISecurityCredential member on SPAvatar, SPAvatarAttachment (diff)
downloadopensim-SC_OLD-6808b9109e33a111e3655ae214cd7b80ef3346f4.zip
opensim-SC_OLD-6808b9109e33a111e3655ae214cd7b80ef3346f4.tar.gz
opensim-SC_OLD-6808b9109e33a111e3655ae214cd7b80ef3346f4.tar.bz2
opensim-SC_OLD-6808b9109e33a111e3655ae214cd7b80ef3346f4.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim into inventory-connector
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index b9edd6e..33166df 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2076,6 +2076,7 @@ namespace OpenSim.Region.Framework.Scenes
2076 client.OnUpdatePrimTexture += m_sceneGraph.UpdatePrimTexture; 2076 client.OnUpdatePrimTexture += m_sceneGraph.UpdatePrimTexture;
2077 client.OnTeleportLocationRequest += RequestTeleportLocation; 2077 client.OnTeleportLocationRequest += RequestTeleportLocation;
2078 client.OnTeleportLandmarkRequest += RequestTeleportLandmark; 2078 client.OnTeleportLandmarkRequest += RequestTeleportLandmark;
2079 client.OnObjectRequest += RequestPrim;
2079 client.OnObjectSelect += SelectPrim; 2080 client.OnObjectSelect += SelectPrim;
2080 client.OnObjectDeselect += DeselectPrim; 2081 client.OnObjectDeselect += DeselectPrim;
2081 client.OnGrabUpdate += m_sceneGraph.MoveObject; 2082 client.OnGrabUpdate += m_sceneGraph.MoveObject;