diff options
| author | John Hurliman | 2010-09-03 13:36:59 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-09-03 13:36:59 -0700 |
| commit | aadbffffb1ff61ed24f2e2ecd78d11b8d0851d34 (patch) | |
| tree | 30af81e23062b91bd333af5484443ad703f118e5 /OpenSim/Region/CoreModules/Framework | |
| parent | * Removed Simian.IsSimianEnabled() call, changed the SimianGrid connectors to... (diff) | |
| parent | minor: remove mono compiler warnings (diff) | |
| download | opensim-SC_OLD-aadbffffb1ff61ed24f2e2ecd78d11b8d0851d34.zip opensim-SC_OLD-aadbffffb1ff61ed24f2e2ecd78d11b8d0851d34.tar.gz opensim-SC_OLD-aadbffffb1ff61ed24f2e2ecd78d11b8d0851d34.tar.bz2 opensim-SC_OLD-aadbffffb1ff61ed24f2e2ecd78d11b8d0851d34.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs | 12 | ||||
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs index 6294935..b62df18 100644 --- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs +++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs | |||
| @@ -54,12 +54,12 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
| 54 | }; | 54 | }; |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | private static byte[] uintToByteArray(uint uIntValue) | 57 | // private static byte[] uintToByteArray(uint uIntValue) |
| 58 | { | 58 | // { |
| 59 | byte[] result = new byte[4]; | 59 | // byte[] result = new byte[4]; |
| 60 | Utils.UIntToBytesBig(uIntValue, result, 0); | 60 | // Utils.UIntToBytesBig(uIntValue, result, 0); |
| 61 | return result; | 61 | // return result; |
| 62 | } | 62 | // } |
| 63 | 63 | ||
| 64 | public static OSD buildEvent(string eventName, OSD eventBody) | 64 | public static OSD buildEvent(string eventName, OSD eventBody) |
| 65 | { | 65 | { |
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index c673b31..125a397 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | |||
| @@ -132,7 +132,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
| 132 | } | 132 | } |
| 133 | 133 | ||
| 134 | // DO NOT OVERRIDE THE BASE METHOD | 134 | // DO NOT OVERRIDE THE BASE METHOD |
| 135 | public virtual UUID DeleteToInventory(DeRezAction action, UUID folderID, | 135 | public new virtual UUID DeleteToInventory(DeRezAction action, UUID folderID, |
| 136 | SceneObjectGroup objectGroup, IClientAPI remoteClient) | 136 | SceneObjectGroup objectGroup, IClientAPI remoteClient) |
| 137 | { | 137 | { |
| 138 | UUID assetID = base.DeleteToInventory(action, folderID, new List<SceneObjectGroup>() {objectGroup}, remoteClient); | 138 | UUID assetID = base.DeleteToInventory(action, folderID, new List<SceneObjectGroup>() {objectGroup}, remoteClient); |