diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/XferManager.cs (renamed from OpenSim/Region/Environment/XferManagaer.cs) | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index d3aafcc..45bda63 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -77,7 +77,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
77 | protected AgentCircuitManager authenticateHandler; | 77 | protected AgentCircuitManager authenticateHandler; |
78 | protected RegionCommsListener regionCommsHost; | 78 | protected RegionCommsListener regionCommsHost; |
79 | protected CommunicationsManager commsManager; | 79 | protected CommunicationsManager commsManager; |
80 | protected XferManagaer xferManager; | 80 | protected XferManager xferManager; |
81 | 81 | ||
82 | protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>(); | 82 | protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>(); |
83 | protected BaseHttpServer httpListener; | 83 | protected BaseHttpServer httpListener; |
@@ -164,7 +164,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
164 | m_scriptManager = new ScriptManager(this); | 164 | m_scriptManager = new ScriptManager(this); |
165 | m_eventManager = new EventManager(); | 165 | m_eventManager = new EventManager(); |
166 | m_permissionManager = new PermissionManager(this); | 166 | m_permissionManager = new PermissionManager(this); |
167 | xferManager = new XferManagaer(); | 167 | xferManager = new XferManager(); |
168 | 168 | ||
169 | m_eventManager.OnParcelPrimCountAdd += | 169 | m_eventManager.OnParcelPrimCountAdd += |
170 | m_LandManager.addPrimToLandPrimCounts; | 170 | m_LandManager.addPrimToLandPrimCounts; |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 219de84..a9f283f 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -612,7 +612,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
612 | return false; | 612 | return false; |
613 | } | 613 | } |
614 | 614 | ||
615 | public string RequestInventoryFile(uint localID, XferManagaer xferManager) | 615 | public string RequestInventoryFile(uint localID, XferManager xferManager) |
616 | { | 616 | { |
617 | SceneObjectPart part = this.GetChildPrim(localID); | 617 | SceneObjectPart part = this.GetChildPrim(localID); |
618 | if (part != null) | 618 | if (part != null) |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 5fa79fb..8735070 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -450,7 +450,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
450 | return false; | 450 | return false; |
451 | } | 451 | } |
452 | 452 | ||
453 | public string RequestInventoryFile(XferManagaer xferManager) | 453 | public string RequestInventoryFile(XferManager xferManager) |
454 | { | 454 | { |
455 | byte[] fileData = new byte[0]; | 455 | byte[] fileData = new byte[0]; |
456 | InventoryStringBuilder invString = new InventoryStringBuilder(m_folderID, this.UUID); | 456 | InventoryStringBuilder invString = new InventoryStringBuilder(m_folderID, this.UUID); |
diff --git a/OpenSim/Region/Environment/XferManagaer.cs b/OpenSim/Region/Environment/XferManager.cs index 30fbaf0..7a8e762 100644 --- a/OpenSim/Region/Environment/XferManagaer.cs +++ b/OpenSim/Region/Environment/XferManager.cs | |||
@@ -8,12 +8,12 @@ using OpenSim.Framework.Utilities; | |||
8 | 8 | ||
9 | namespace OpenSim.Region.Environment | 9 | namespace OpenSim.Region.Environment |
10 | { | 10 | { |
11 | public class XferManagaer | 11 | public class XferManager |
12 | { | 12 | { |
13 | public Dictionary<string, byte[]> NewFiles = new Dictionary<string, byte[]>(); | 13 | public Dictionary<string, byte[]> NewFiles = new Dictionary<string, byte[]>(); |
14 | public Dictionary<ulong, XferDownLoad> Transfers = new Dictionary<ulong, XferDownLoad>(); | 14 | public Dictionary<ulong, XferDownLoad> Transfers = new Dictionary<ulong, XferDownLoad>(); |
15 | 15 | ||
16 | public XferManagaer() | 16 | public XferManager() |
17 | { | 17 | { |
18 | 18 | ||
19 | } | 19 | } |