diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-16 12:15:14 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-16 12:15:14 -0400 |
| commit | acc14c472deeb92e0436ac38d16e3f6e049bc546 (patch) | |
| tree | b31fd0fd1992c1ea6cad2cc1123ab2422953372f /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | * ShortVersion, another attempt at fixing the test thread death that randomly... (diff) | |
| parent | * Implements ISecurityCredential member on SPAvatar, SPAvatarAttachment (diff) | |
| download | opensim-SC-acc14c472deeb92e0436ac38d16e3f6e049bc546.zip opensim-SC-acc14c472deeb92e0436ac38d16e3f6e049bc546.tar.gz opensim-SC-acc14c472deeb92e0436ac38d16e3f6e049bc546.tar.bz2 opensim-SC-acc14c472deeb92e0436ac38d16e3f6e049bc546.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 18d7bad..a2275f8 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; |