diff options
| author | Melanie | 2011-11-14 20:03:47 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-14 20:03:47 +0000 |
| commit | afca742392e30748de13a125f932046949af0bcb (patch) | |
| tree | 34e9dd92533abe446e356d9fb1ad8625cb28c9bc /OpenSim/Region/CoreModules/ServiceConnectorsOut | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | minor: remove some mono compiler warnings (diff) | |
| download | opensim-SC_OLD-afca742392e30748de13a125f932046949af0bcb.zip opensim-SC_OLD-afca742392e30748de13a125f932046949af0bcb.tar.gz opensim-SC_OLD-afca742392e30748de13a125f932046949af0bcb.tar.bz2 opensim-SC_OLD-afca742392e30748de13a125f932046949af0bcb.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs index 73ab4e3..10ab6d0 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | |||
| @@ -50,8 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
| 50 | /// </summary> | 50 | /// </summary> |
| 51 | public Scene Scene { get; set; } | 51 | public Scene Scene { get; set; } |
| 52 | 52 | ||
| 53 | private bool m_Enabled = false; | 53 | private bool m_Enabled; |
| 54 | private Scene m_Scene; | ||
| 55 | private XInventoryServicesConnector m_RemoteConnector; | 54 | private XInventoryServicesConnector m_RemoteConnector; |
| 56 | 55 | ||
| 57 | private IUserManagement m_UserManager; | 56 | private IUserManagement m_UserManager; |