From 3d26e6ede04389252332d9ba25016155ee607411 Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Fri, 27 Jun 2008 19:57:06 +0000 Subject: move along, nothing to see here. just a couple of lazy variables. --- .../Modules/Scripting/LoadImageURL/LoadImageURLModule.cs | 3 ++- .../Environment/Modules/World/Estate/EstateManagementModule.cs | 3 ++- .../Environment/Modules/World/Permissions/PermissionsModule.cs | 10 +++++----- .../Environment/Modules/World/Serialiser/SerialiserModule.cs | 6 ++++-- 4 files changed, 13 insertions(+), 9 deletions(-) (limited to 'OpenSim/Region/Environment/Modules') diff --git a/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs index c828ef0..725322b 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs @@ -122,7 +122,8 @@ namespace OpenSim.Region.Environment.Modules.Scripting.LoadImageURL { WebRequest request = HttpWebRequest.Create(url); RequestState state = new RequestState((HttpWebRequest) request, requestID); - IAsyncResult result = request.BeginGetResponse(new AsyncCallback(HttpRequestReturn), state); + // IAsyncResult result = request.BeginGetResponse(new AsyncCallback(HttpRequestReturn), state); + request.BeginGetResponse(new AsyncCallback(HttpRequestReturn), state); TimeSpan t = (DateTime.UtcNow - new DateTime(1970, 1, 1)); state.TimeOfRequest = (int) t.TotalSeconds; diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs index b6d2ab4..3f8cc0b 100644 --- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs @@ -500,7 +500,8 @@ namespace OpenSim.Region.Environment.Modules.World.Estate for (int i = 0; i < uuidarr.Length; i++) { - string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]); + // string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]); + m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]); // we drop it. It gets cached though... so we're ready for the next request. } } diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index e8defb7..d6ee739 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs @@ -310,7 +310,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions objectOwnerMask |= (uint)LLObject.ObjectFlags.ObjectYouOwner | (uint)LLObject.ObjectFlags.ObjectOwnerModify; // Customize the GroupMask - uint objectGroupMask = ApplyObjectModifyMasks(task.GroupMask, objflags); + // uint objectGroupMask = ApplyObjectModifyMasks(task.GroupMask, objflags); // Customize the EveryoneMask uint objectEveryoneMask = ApplyObjectModifyMasks(task.EveryoneMask, objflags); @@ -655,10 +655,10 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID]; - LLUUID taskOwner = null; + // LLUUID taskOwner = null; // Added this because at this point in time it wouldn't be wise for // the administrator object permissions to take effect. - LLUUID objectOwner = task.OwnerID; + // LLUUID objectOwner = task.OwnerID; // Anyone can move if ((task.RootPart.EveryoneMask & PERM_MOVE) != 0) @@ -842,10 +842,10 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions } SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID]; - LLUUID taskOwner = null; + // LLUUID taskOwner = null; // Added this because at this point in time it wouldn't be wise for // the administrator object permissions to take effect. - LLUUID objectOwner = task.OwnerID; + // LLUUID objectOwner = task.OwnerID; if ((task.RootPart.EveryoneMask & PERM_COPY) != 0) diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs index 01f6301..28f3996 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs @@ -177,7 +177,8 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser { if (region.RegionInfo.RegionName == (string) args[0]) { - List results = SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/"); + // List results = SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/"); + SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/"); } } } @@ -186,7 +187,8 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser { foreach (Scene region in m_regions) { - List results = SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/"); + // List results = SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/"); + SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/"); } } -- cgit v1.1