Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs

1 files changed, 0 insertions, 2 deletions

diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index b95bda5..f4cca96 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -625,7 +625,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         public void handleOnEstateManageTelehub (IClientAPI client, UUID invoice, UUID senderID, string cmd, uint param1)
         {
-            uint ObjectLocalID;
             SceneObjectPart part;
 
             switch (cmd)
@@ -908,7 +907,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 return;
 
             Dictionary<uint, float> sceneData = null;
-            List<UUID> uuidNameLookupList = new List<UUID>();
 
             if (reportType == 1)
             {