diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
4 files changed, 13 insertions, 9 deletions
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 | |||
122 | { | 122 | { |
123 | WebRequest request = HttpWebRequest.Create(url); | 123 | WebRequest request = HttpWebRequest.Create(url); |
124 | RequestState state = new RequestState((HttpWebRequest) request, requestID); | 124 | RequestState state = new RequestState((HttpWebRequest) request, requestID); |
125 | IAsyncResult result = request.BeginGetResponse(new AsyncCallback(HttpRequestReturn), state); | 125 | // IAsyncResult result = request.BeginGetResponse(new AsyncCallback(HttpRequestReturn), state); |
126 | request.BeginGetResponse(new AsyncCallback(HttpRequestReturn), state); | ||
126 | 127 | ||
127 | TimeSpan t = (DateTime.UtcNow - new DateTime(1970, 1, 1)); | 128 | TimeSpan t = (DateTime.UtcNow - new DateTime(1970, 1, 1)); |
128 | state.TimeOfRequest = (int) t.TotalSeconds; | 129 | 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 | |||
500 | 500 | ||
501 | for (int i = 0; i < uuidarr.Length; i++) | 501 | for (int i = 0; i < uuidarr.Length; i++) |
502 | { | 502 | { |
503 | string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]); | 503 | // string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]); |
504 | m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]); | ||
504 | // we drop it. It gets cached though... so we're ready for the next request. | 505 | // we drop it. It gets cached though... so we're ready for the next request. |
505 | } | 506 | } |
506 | } | 507 | } |
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 | |||
310 | objectOwnerMask |= (uint)LLObject.ObjectFlags.ObjectYouOwner | (uint)LLObject.ObjectFlags.ObjectOwnerModify; | 310 | objectOwnerMask |= (uint)LLObject.ObjectFlags.ObjectYouOwner | (uint)LLObject.ObjectFlags.ObjectOwnerModify; |
311 | 311 | ||
312 | // Customize the GroupMask | 312 | // Customize the GroupMask |
313 | uint objectGroupMask = ApplyObjectModifyMasks(task.GroupMask, objflags); | 313 | // uint objectGroupMask = ApplyObjectModifyMasks(task.GroupMask, objflags); |
314 | 314 | ||
315 | // Customize the EveryoneMask | 315 | // Customize the EveryoneMask |
316 | uint objectEveryoneMask = ApplyObjectModifyMasks(task.EveryoneMask, objflags); | 316 | uint objectEveryoneMask = ApplyObjectModifyMasks(task.EveryoneMask, objflags); |
@@ -655,10 +655,10 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
655 | SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID]; | 655 | SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID]; |
656 | 656 | ||
657 | 657 | ||
658 | LLUUID taskOwner = null; | 658 | // LLUUID taskOwner = null; |
659 | // Added this because at this point in time it wouldn't be wise for | 659 | // Added this because at this point in time it wouldn't be wise for |
660 | // the administrator object permissions to take effect. | 660 | // the administrator object permissions to take effect. |
661 | LLUUID objectOwner = task.OwnerID; | 661 | // LLUUID objectOwner = task.OwnerID; |
662 | 662 | ||
663 | // Anyone can move | 663 | // Anyone can move |
664 | if ((task.RootPart.EveryoneMask & PERM_MOVE) != 0) | 664 | if ((task.RootPart.EveryoneMask & PERM_MOVE) != 0) |
@@ -842,10 +842,10 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
842 | } | 842 | } |
843 | 843 | ||
844 | SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID]; | 844 | SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID]; |
845 | LLUUID taskOwner = null; | 845 | // LLUUID taskOwner = null; |
846 | // Added this because at this point in time it wouldn't be wise for | 846 | // Added this because at this point in time it wouldn't be wise for |
847 | // the administrator object permissions to take effect. | 847 | // the administrator object permissions to take effect. |
848 | LLUUID objectOwner = task.OwnerID; | 848 | // LLUUID objectOwner = task.OwnerID; |
849 | 849 | ||
850 | 850 | ||
851 | if ((task.RootPart.EveryoneMask & PERM_COPY) != 0) | 851 | 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 | |||
177 | { | 177 | { |
178 | if (region.RegionInfo.RegionName == (string) args[0]) | 178 | if (region.RegionInfo.RegionName == (string) args[0]) |
179 | { | 179 | { |
180 | List<string> results = SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/"); | 180 | // List<string> results = SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/"); |
181 | SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/"); | ||
181 | } | 182 | } |
182 | } | 183 | } |
183 | } | 184 | } |
@@ -186,7 +187,8 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser | |||
186 | { | 187 | { |
187 | foreach (Scene region in m_regions) | 188 | foreach (Scene region in m_regions) |
188 | { | 189 | { |
189 | List<string> results = SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/"); | 190 | // List<string> results = SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/"); |
191 | SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/"); | ||
190 | } | 192 | } |
191 | } | 193 | } |
192 | 194 | ||