diff options
author | Justin Clark-Casey (justincc) | 2012-05-03 01:56:24 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-05-03 01:56:24 +0100 |
commit | 9ffc2c106280a7b5b0eddba8cf906f1f7ad956a6 (patch) | |
tree | 416b3523239151ba9c99676b3f8f741cce38d702 /OpenSim/Region/CoreModules | |
parent | Implement optional name and description on http stream handlers so that we ca... (diff) | |
download | opensim-SC_OLD-9ffc2c106280a7b5b0eddba8cf906f1f7ad956a6.zip opensim-SC_OLD-9ffc2c106280a7b5b0eddba8cf906f1f7ad956a6.tar.gz opensim-SC_OLD-9ffc2c106280a7b5b0eddba8cf906f1f7ad956a6.tar.bz2 opensim-SC_OLD-9ffc2c106280a7b5b0eddba8cf906f1f7ad956a6.tar.xz |
minor: resolve some mono compiler warnings
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/AuthorizationService.cs | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 8d5e0a5..e47c339 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -1947,12 +1947,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1947 | Thread.Sleep(100); | 1947 | Thread.Sleep(100); |
1948 | } | 1948 | } |
1949 | 1949 | ||
1950 | if (count > 0) | 1950 | return count > 0; |
1951 | return true; | ||
1952 | else | ||
1953 | return false; | ||
1954 | |||
1955 | return true; | ||
1956 | } | 1951 | } |
1957 | 1952 | ||
1958 | protected void SetInTransit(UUID id) | 1953 | protected void SetInTransit(UUID id) |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/AuthorizationService.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/AuthorizationService.cs index f0d21e6..4470799 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/AuthorizationService.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/AuthorizationService.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization | |||
55 | MethodBase.GetCurrentMethod().DeclaringType); | 55 | MethodBase.GetCurrentMethod().DeclaringType); |
56 | 56 | ||
57 | private IUserManagement m_UserManagement; | 57 | private IUserManagement m_UserManagement; |
58 | private IGridService m_GridService; | 58 | // private IGridService m_GridService; |
59 | 59 | ||
60 | private Scene m_Scene; | 60 | private Scene m_Scene; |
61 | AccessFlags m_accessValue = AccessFlags.None; | 61 | AccessFlags m_accessValue = AccessFlags.None; |
@@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization | |||
65 | { | 65 | { |
66 | m_Scene = scene; | 66 | m_Scene = scene; |
67 | m_UserManagement = scene.RequestModuleInterface<IUserManagement>(); | 67 | m_UserManagement = scene.RequestModuleInterface<IUserManagement>(); |
68 | m_GridService = scene.GridService; | 68 | // m_GridService = scene.GridService; |
69 | 69 | ||
70 | if (config != null) | 70 | if (config != null) |
71 | { | 71 | { |