1 files changed, 1 insertions, 84 deletions

diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index 1a99c83..0b8771c 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -88,89 +88,7 @@ namespace OpenSim.Region.RegionCombinerModule
         public void RegionLoaded(Scene scene)
         {
             if (enabledYN)
-            {
                 RegionLoadedDoWork(scene);
-
-                scene.EventManager.OnNewPresence += NewPresence;
-            }
-        }
-
-        private void NewPresence(ScenePresence presence)
-        {
-            if (presence.IsChildAgent)
-            {
-                byte[] throttleData;
-
-                try
-                {
-                    throttleData = presence.ControllingClient.GetThrottlesPacked(1);
-                } 
-                catch (NotImplementedException)
-                {
-                    return;
-                }
-
-                if (throttleData == null)
-                    return;
-
-                if (throttleData.Length == 0)
-                    return;
-
-                if (throttleData.Length != 28)
-                    return;
-
-                byte[] adjData;
-                int pos = 0;
-
-                if (!BitConverter.IsLittleEndian)
-                {
-                    byte[] newData = new byte[7 * 4];
-                    Buffer.BlockCopy(throttleData, 0, newData, 0, 7 * 4);
-
-                    for (int i = 0; i < 7; i++)
-                        Array.Reverse(newData, i * 4, 4);
-
-                    adjData = newData;
-                }
-                else
-                {
-                    adjData = throttleData;
-                }
-
-                // 0.125f converts from bits to bytes
-                int resend = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
-                int land = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
-                int wind = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
-                int cloud = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
-                int task = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
-                int texture = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
-                int asset = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f);
-                // State is a subcategory of task that we allocate a percentage to
-
-
-                //int total = resend + land + wind + cloud + task + texture + asset;
-
-                byte[] data = new byte[7 * 4];
-                int ii = 0;
-
-                Buffer.BlockCopy(Utils.FloatToBytes(resend), 0, data, ii, 4); ii += 4;
-                Buffer.BlockCopy(Utils.FloatToBytes(land * 50), 0, data, ii, 4); ii += 4;
-                Buffer.BlockCopy(Utils.FloatToBytes(wind), 0, data, ii, 4); ii += 4;
-                Buffer.BlockCopy(Utils.FloatToBytes(cloud), 0, data, ii, 4); ii += 4;
-                Buffer.BlockCopy(Utils.FloatToBytes(task), 0, data, ii, 4); ii += 4;
-                Buffer.BlockCopy(Utils.FloatToBytes(texture), 0, data, ii, 4); ii += 4;
-                Buffer.BlockCopy(Utils.FloatToBytes(asset), 0, data, ii, 4);
-
-                try
-                {
-                    presence.ControllingClient.SetChildAgentThrottle(data);
-                }
-                catch (NotImplementedException)
-                {
-                    return;
-                }
-
-            }
         }
 
         private void RegionLoadedDoWork(Scene scene)
@@ -1004,7 +922,7 @@ namespace OpenSim.Region.RegionCombinerModule
             VirtualRegion.Permissions.OnIssueEstateCommand += BigRegion.PermissionModule.CanIssueEstateCommand; //FULLY IMPLEMENTED
             VirtualRegion.Permissions.OnMoveObject += BigRegion.PermissionModule.CanMoveObject; //MAYBE FULLY IMPLEMENTED
             VirtualRegion.Permissions.OnObjectEntry += BigRegion.PermissionModule.CanObjectEntry;
-            VirtualRegion.Permissions.OnReturnObject += BigRegion.PermissionModule.CanReturnObject; //NOT YET IMPLEMENTED
+            VirtualRegion.Permissions.OnReturnObjects += BigRegion.PermissionModule.CanReturnObjects; //NOT YET IMPLEMENTED
             VirtualRegion.Permissions.OnRezObject += BigRegion.PermissionModule.CanRezObject; //MAYBE FULLY IMPLEMENTED
             VirtualRegion.Permissions.OnRunConsoleCommand += BigRegion.PermissionModule.CanRunConsoleCommand;
             VirtualRegion.Permissions.OnRunScript += BigRegion.PermissionModule.CanRunScript; //NOT YET IMPLEMENTED
@@ -1030,7 +948,6 @@ namespace OpenSim.Region.RegionCombinerModule
             VirtualRegion.Permissions.OnEditUserInventory += BigRegion.PermissionModule.CanEditUserInventory; //NOT YET IMPLEMENTED
             VirtualRegion.Permissions.OnDeleteUserInventory += BigRegion.PermissionModule.CanDeleteUserInventory; //NOT YET IMPLEMENTED
             VirtualRegion.Permissions.OnTeleport += BigRegion.PermissionModule.CanTeleport; //NOT YET IMPLEMENTED
-            VirtualRegion.Permissions.OnUseObjectReturn += BigRegion.PermissionModule.CanUseObjectReturn; //NOT YET IMPLEMENTED
         }
 
         #region console commands