aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2012-02-02 13:46:46 +0100
committerMelanie2012-02-02 13:46:46 +0100
commit857d4e60cca3ad749e65a10c24e22a48f7631f35 (patch)
tree2c8d45590f2ee94b701b7b21feb6542af5226465 /OpenSim/Region
parentFix remembering attachment point and position when an item is rezzed in world. (diff)
downloadopensim-SC-857d4e60cca3ad749e65a10c24e22a48f7631f35.zip
opensim-SC-857d4e60cca3ad749e65a10c24e22a48f7631f35.tar.gz
opensim-SC-857d4e60cca3ad749e65a10c24e22a48f7631f35.tar.bz2
opensim-SC-857d4e60cca3ad749e65a10c24e22a48f7631f35.tar.xz
Rehook the eject and freeze events that had gotten unhooked in the merge
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 7a236bc..400e453 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -205,6 +205,8 @@ namespace OpenSim.Region.CoreModules.World.Land
205 client.OnParcelInfoRequest += ClientOnParcelInfoRequest; 205 client.OnParcelInfoRequest += ClientOnParcelInfoRequest;
206 client.OnParcelDeedToGroup += ClientOnParcelDeedToGroup; 206 client.OnParcelDeedToGroup += ClientOnParcelDeedToGroup;
207 client.OnPreAgentUpdate += ClientOnPreAgentUpdate; 207 client.OnPreAgentUpdate += ClientOnPreAgentUpdate;
208 client.OnParcelEjectUser += ClientOnParcelEjectUser;
209 client.OnParcelFreezeUser += ClientOnParcelFreezeUser;
208 210
209 EntityBase presenceEntity; 211 EntityBase presenceEntity;
210 if (m_scene.Entities.TryGetValue(client.AgentId, out presenceEntity) && presenceEntity is ScenePresence) 212 if (m_scene.Entities.TryGetValue(client.AgentId, out presenceEntity) && presenceEntity is ScenePresence)