diff options
author | Melanie | 2010-03-30 23:29:03 +0100 |
---|---|---|
committer | Melanie | 2010-03-30 23:29:03 +0100 |
commit | 7d917e7c5c599549d2a87451fe3d6ca2bf6e62a4 (patch) | |
tree | 4fbeba0476276a867859d257d369689385d2b54c /OpenSim/Region/CoreModules/World/Land | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-7d917e7c5c599549d2a87451fe3d6ca2bf6e62a4.zip opensim-SC-7d917e7c5c599549d2a87451fe3d6ca2bf6e62a4.tar.gz opensim-SC-7d917e7c5c599549d2a87451fe3d6ca2bf6e62a4.tar.bz2 opensim-SC-7d917e7c5c599549d2a87451fe3d6ca2bf6e62a4.tar.xz |
Rename Meta7Windlight to LightShare
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index b6afac6..7f6a0ad 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -1532,7 +1532,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1532 | private void ClientOnSimWideDeletes(IClientAPI client, UUID agentID, int flags, UUID targetID) | 1532 | private void ClientOnSimWideDeletes(IClientAPI client, UUID agentID, int flags, UUID targetID) |
1533 | { | 1533 | { |
1534 | ScenePresence SP; | 1534 | ScenePresence SP; |
1535 | ((Scene)client.Scene).TryGetAvatar(client.AgentId, out SP); | 1535 | ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out SP); |
1536 | List<SceneObjectGroup> returns = new List<SceneObjectGroup>(); | 1536 | List<SceneObjectGroup> returns = new List<SceneObjectGroup>(); |
1537 | if (SP.GodLevel != 0) | 1537 | if (SP.GodLevel != 0) |
1538 | { | 1538 | { |
@@ -1597,9 +1597,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1597 | public void ClientOnParcelFreezeUser(IClientAPI client, UUID parcelowner, uint flags, UUID target) | 1597 | public void ClientOnParcelFreezeUser(IClientAPI client, UUID parcelowner, uint flags, UUID target) |
1598 | { | 1598 | { |
1599 | ScenePresence targetAvatar = null; | 1599 | ScenePresence targetAvatar = null; |
1600 | ((Scene)client.Scene).TryGetAvatar(target, out targetAvatar); | 1600 | ((Scene)client.Scene).TryGetScenePresence(target, out targetAvatar); |
1601 | ScenePresence parcelManager = null; | 1601 | ScenePresence parcelManager = null; |
1602 | ((Scene)client.Scene).TryGetAvatar(client.AgentId, out parcelManager); | 1602 | ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out parcelManager); |
1603 | System.Threading.Timer Timer; | 1603 | System.Threading.Timer Timer; |
1604 | 1604 | ||
1605 | if (targetAvatar.GodLevel == 0) | 1605 | if (targetAvatar.GodLevel == 0) |
@@ -1641,9 +1641,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1641 | public void ClientOnParcelEjectUser(IClientAPI client, UUID parcelowner, uint flags, UUID target) | 1641 | public void ClientOnParcelEjectUser(IClientAPI client, UUID parcelowner, uint flags, UUID target) |
1642 | { | 1642 | { |
1643 | ScenePresence targetAvatar = null; | 1643 | ScenePresence targetAvatar = null; |
1644 | ((Scene)client.Scene).TryGetAvatar(target, out targetAvatar); | 1644 | ((Scene)client.Scene).TryGetScenePresence(target, out targetAvatar); |
1645 | ScenePresence parcelManager = null; | 1645 | ScenePresence parcelManager = null; |
1646 | ((Scene)client.Scene).TryGetAvatar(client.AgentId, out parcelManager); | 1646 | ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out parcelManager); |
1647 | //Just eject | 1647 | //Just eject |
1648 | if (flags == 0) | 1648 | if (flags == 0) |
1649 | { | 1649 | { |