Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor

author: Melanie 2010-12-13 20:20:02 +0000
committer: Melanie 2010-12-13 20:20:02 +0000
commit: 7538926292ba3380f71f7fb3c004113dd2a92f95 (patch)
tree: 02619821cdb7207b6aae26c01ce6ca29d58ce452 /OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
parent: Merge branch 'master' into careminster-presence-refactor (diff)
parent: Revamp the viewer -> banlist packet processing so fix a number of bugs. (diff)
download: opensim-SC-7538926292ba3380f71f7fb3c004113dd2a92f95.zip
opensim-SC-7538926292ba3380f71f7fb3c004113dd2a92f95.tar.gz
opensim-SC-7538926292ba3380f71f7fb3c004113dd2a92f95.tar.bz2
opensim-SC-7538926292ba3380f71f7fb3c004113dd2a92f95.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index d854176..3edc3a2 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -919,7 +919,7 @@ namespace OpenSim.Region.RegionCombinerModule
            VirtualRegion.Permissions.OnDuplicateObject += BigRegion.PermissionModule.CanDuplicateObject;
            VirtualRegion.Permissions.OnDeleteObject += BigRegion.PermissionModule.CanDeleteObject; //MAYBE FULLY IMPLEMENTED
            VirtualRegion.Permissions.OnEditObject += BigRegion.PermissionModule.CanEditObject; //MAYBE FULLY IMPLEMENTED
-            VirtualRegion.Permissions.OnEditParcel += BigRegion.PermissionModule.CanEditParcel; //MAYBE FULLY IMPLEMENTED
+            VirtualRegion.Permissions.OnEditParcelProperties += BigRegion.PermissionModule.CanEditParcelProperties; //MAYBE FULLY IMPLEMENTED
            VirtualRegion.Permissions.OnInstantMessage += BigRegion.PermissionModule.CanInstantMessage;
            VirtualRegion.Permissions.OnInventoryTransfer += BigRegion.PermissionModule.CanInventoryTransfer; //NOT YET IMPLEMENTED
            VirtualRegion.Permissions.OnIssueEstateCommand += BigRegion.PermissionModule.CanIssueEstateCommand; //FULLY IMPLEMENTED
author	Melanie	2010-12-13 20:20:02 +0000
committer	Melanie	2010-12-13 20:20:02 +0000
commit	7538926292ba3380f71f7fb3c004113dd2a92f95 (patch)
tree	02619821cdb7207b6aae26c01ce6ca29d58ce452 /OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
parent	Merge branch 'master' into careminster-presence-refactor (diff)
parent	Revamp the viewer -> banlist packet processing so fix a number of bugs. (diff)
download	opensim-SC-7538926292ba3380f71f7fb3c004113dd2a92f95.zip opensim-SC-7538926292ba3380f71f7fb3c004113dd2a92f95.tar.gz opensim-SC-7538926292ba3380f71f7fb3c004113dd2a92f95.tar.bz2 opensim-SC-7538926292ba3380f71f7fb3c004113dd2a92f95.tar.xz

diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs index d854176..3edc3a2 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -919,7 +919,7 @@ namespace OpenSim.Region.RegionCombinerModule
919	VirtualRegion.Permissions.OnDuplicateObject += BigRegion.PermissionModule.CanDuplicateObject;	919	VirtualRegion.Permissions.OnDuplicateObject += BigRegion.PermissionModule.CanDuplicateObject;
920	VirtualRegion.Permissions.OnDeleteObject += BigRegion.PermissionModule.CanDeleteObject; //MAYBE FULLY IMPLEMENTED	920	VirtualRegion.Permissions.OnDeleteObject += BigRegion.PermissionModule.CanDeleteObject; //MAYBE FULLY IMPLEMENTED
921	VirtualRegion.Permissions.OnEditObject += BigRegion.PermissionModule.CanEditObject; //MAYBE FULLY IMPLEMENTED	921	VirtualRegion.Permissions.OnEditObject += BigRegion.PermissionModule.CanEditObject; //MAYBE FULLY IMPLEMENTED
922	VirtualRegion.Permissions.OnEditParcel += BigRegion.PermissionModule.CanEditParcel; //MAYBE FULLY IMPLEMENTED	922	VirtualRegion.Permissions.OnEditParcelProperties += BigRegion.PermissionModule.CanEditParcelProperties; //MAYBE FULLY IMPLEMENTED
923	VirtualRegion.Permissions.OnInstantMessage += BigRegion.PermissionModule.CanInstantMessage;	923	VirtualRegion.Permissions.OnInstantMessage += BigRegion.PermissionModule.CanInstantMessage;
924	VirtualRegion.Permissions.OnInventoryTransfer += BigRegion.PermissionModule.CanInventoryTransfer; //NOT YET IMPLEMENTED	924	VirtualRegion.Permissions.OnInventoryTransfer += BigRegion.PermissionModule.CanInventoryTransfer; //NOT YET IMPLEMENTED
925	VirtualRegion.Permissions.OnIssueEstateCommand += BigRegion.PermissionModule.CanIssueEstateCommand; //FULLY IMPLEMENTED	925	VirtualRegion.Permissions.OnIssueEstateCommand += BigRegion.PermissionModule.CanIssueEstateCommand; //FULLY IMPLEMENTED