diff options
11 files changed, 18 insertions, 21 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 8f9b551..2f7faff 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -427,7 +427,7 @@ namespace OpenSim.Framework | |||
427 | if (name == String.Empty) | 427 | if (name == String.Empty) |
428 | throw new Exception("Cannot interactively create region with no name"); | 428 | throw new Exception("Cannot interactively create region with no name"); |
429 | 429 | ||
430 | IConfig newRegion = source.AddConfig(name); | 430 | source.AddConfig(name); |
431 | 431 | ||
432 | creatingNew = true; | 432 | creatingNew = true; |
433 | } | 433 | } |
@@ -437,7 +437,7 @@ namespace OpenSim.Framework | |||
437 | 437 | ||
438 | if (source.Configs[name] == null) | 438 | if (source.Configs[name] == null) |
439 | { | 439 | { |
440 | IConfig newRegion = source.AddConfig(name); | 440 | source.AddConfig(name); |
441 | 441 | ||
442 | creatingNew = true; | 442 | creatingNew = true; |
443 | } | 443 | } |
diff --git a/OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs b/OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs index fed4707..1026248 100644 --- a/OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs +++ b/OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs | |||
@@ -93,10 +93,9 @@ namespace OpenSim.Framework.Servers.Tests | |||
93 | [Test] | 93 | [Test] |
94 | public void TestHandleFetchMissingAsset() | 94 | public void TestHandleFetchMissingAsset() |
95 | { | 95 | { |
96 | IAssetCache assetCache = new TestAssetCache(); | ||
97 | CachedGetAssetStreamHandler handler; | 96 | CachedGetAssetStreamHandler handler; |
98 | OSHttpResponse response; | 97 | OSHttpResponse response; |
99 | AssetBase asset = CreateTestEnvironment(out handler, out response); | 98 | CreateTestEnvironment(out handler, out response); |
100 | 99 | ||
101 | GetAssetStreamHandlerTestHelpers.BaseFetchMissingAsset(handler, response); | 100 | GetAssetStreamHandlerTestHelpers.BaseFetchMissingAsset(handler, response); |
102 | } | 101 | } |
diff --git a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs index afb4a65..35da73f 100644 --- a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs +++ b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs | |||
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Servers.Tests | |||
96 | { | 96 | { |
97 | GetAssetStreamHandler handler; | 97 | GetAssetStreamHandler handler; |
98 | OSHttpResponse response; | 98 | OSHttpResponse response; |
99 | AssetBase asset = CreateTestEnvironment(out handler, out response); | 99 | CreateTestEnvironment(out handler, out response); |
100 | 100 | ||
101 | GetAssetStreamHandlerTestHelpers.BaseFetchMissingAsset(handler, response); | 101 | GetAssetStreamHandlerTestHelpers.BaseFetchMissingAsset(handler, response); |
102 | } | 102 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs index 01c95d7..6c3a025 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs | |||
@@ -48,8 +48,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour | |||
48 | 48 | ||
49 | private bool m_Enabled = false; | 49 | private bool m_Enabled = false; |
50 | private LocalNeighbourServicesConnector m_LocalService; | 50 | private LocalNeighbourServicesConnector m_LocalService; |
51 | private string serviceDll; | 51 | //private string serviceDll; |
52 | private List<Scene> m_Scenes = new List<Scene>(); | 52 | //private List<Scene> m_Scenes = new List<Scene>(); |
53 | 53 | ||
54 | public Type ReplacableInterface | 54 | public Type ReplacableInterface |
55 | { | 55 | { |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 56369f5..296c554 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -145,8 +145,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
145 | 145 | ||
146 | private Vector3 m_lastVelocity = Vector3.Zero; | 146 | private Vector3 m_lastVelocity = Vector3.Zero; |
147 | 147 | ||
148 | private int m_maxPrimsPerFrame = 200; | ||
149 | |||
150 | // Default AV Height | 148 | // Default AV Height |
151 | private float m_avHeight = 127.0f; | 149 | private float m_avHeight = 127.0f; |
152 | 150 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs index 87bd20e..f6737a5 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs | |||
@@ -74,7 +74,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
74 | [Test] | 74 | [Test] |
75 | public void TestConstructor() | 75 | public void TestConstructor() |
76 | { | 76 | { |
77 | SceneBase scene = new SceneBaseImpl(); | 77 | new SceneBaseImpl(); |
78 | } | 78 | } |
79 | } | 79 | } |
80 | } | 80 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs index d18545b..1c9bce4 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs | |||
@@ -132,7 +132,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
132 | RegionInfo regionInfo = new RegionInfo(0,0,null,null); | 132 | RegionInfo regionInfo = new RegionInfo(0,0,null,null); |
133 | FakeStorageManager storageManager = new FakeStorageManager(); | 133 | FakeStorageManager storageManager = new FakeStorageManager(); |
134 | 134 | ||
135 | Scene scene = new Scene(regionInfo, null, null, null, storageManager, null, false, false, false, null, null); | 135 | new Scene(regionInfo, null, null, null, storageManager, null, false, false, false, null, null); |
136 | } | 136 | } |
137 | } | 137 | } |
138 | } | 138 | } |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs index 8a38f01..ce2d339 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs | |||
@@ -42,7 +42,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
42 | { | 42 | { |
43 | private readonly Scene m_rootScene; | 43 | private readonly Scene m_rootScene; |
44 | private readonly UUID m_ID; | 44 | private readonly UUID m_ID; |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 46 | ||
47 | public SPAvatar(Scene scene, UUID ID) | 47 | public SPAvatar(Scene scene, UUID ID) |
48 | { | 48 | { |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs index 971119f..9b684fe 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs | |||
@@ -35,17 +35,17 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
35 | public class SPAvatarAttachment : IAvatarAttachment | 35 | public class SPAvatarAttachment : IAvatarAttachment |
36 | { | 36 | { |
37 | private readonly Scene m_rootScene; | 37 | private readonly Scene m_rootScene; |
38 | private readonly IAvatar m_parent; | 38 | //private readonly IAvatar m_parent; |
39 | private readonly int m_location; | 39 | private readonly int m_location; |
40 | private readonly UUID m_itemId; | 40 | //private readonly UUID m_itemId; |
41 | private readonly UUID m_assetId; | 41 | private readonly UUID m_assetId; |
42 | 42 | ||
43 | public SPAvatarAttachment(Scene rootScene, IAvatar self, int location, UUID itemId, UUID assetId) | 43 | public SPAvatarAttachment(Scene rootScene, IAvatar self, int location, UUID itemId, UUID assetId) |
44 | { | 44 | { |
45 | m_rootScene = rootScene; | 45 | m_rootScene = rootScene; |
46 | m_parent = self; | 46 | //m_parent = self; |
47 | m_location = location; | 47 | m_location = location; |
48 | m_itemId = itemId; | 48 | //m_itemId = itemId; |
49 | m_assetId = assetId; | 49 | m_assetId = assetId; |
50 | } | 50 | } |
51 | 51 | ||
diff --git a/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs b/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs index 2615358..04a73e4 100644 --- a/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs +++ b/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs | |||
@@ -46,7 +46,7 @@ namespace OpenSim.Server.Handlers.Tests.Asset | |||
46 | { | 46 | { |
47 | TestHelper.InMethod(); | 47 | TestHelper.InMethod(); |
48 | 48 | ||
49 | AssetServerGetHandler handler = new AssetServerGetHandler(null); | 49 | new AssetServerGetHandler(null); |
50 | } | 50 | } |
51 | 51 | ||
52 | [Test] | 52 | [Test] |
diff --git a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs index e95b83d..6a93c04 100644 --- a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs | |||
@@ -43,13 +43,13 @@ namespace OpenSim.Services.Connectors | |||
43 | /// </summary> | 43 | /// </summary> |
44 | public class QuickAndDirtyInventoryServiceConnector : IInventoryService | 44 | public class QuickAndDirtyInventoryServiceConnector : IInventoryService |
45 | { | 45 | { |
46 | private static readonly ILog m_log = | 46 | // private static readonly ILog m_log = |
47 | LogManager.GetLogger( | 47 | // LogManager.GetLogger( |
48 | MethodBase.GetCurrentMethod().DeclaringType); | 48 | // MethodBase.GetCurrentMethod().DeclaringType); |
49 | 49 | ||
50 | private string m_ServerURI = String.Empty; | 50 | private string m_ServerURI = String.Empty; |
51 | 51 | ||
52 | private Dictionary<UUID, InventoryReceiptCallback> m_RequestingInventory = new Dictionary<UUID, InventoryReceiptCallback>(); | 52 | //private Dictionary<UUID, InventoryReceiptCallback> m_RequestingInventory = new Dictionary<UUID, InventoryReceiptCallback>(); |
53 | 53 | ||
54 | public QuickAndDirtyInventoryServiceConnector() | 54 | public QuickAndDirtyInventoryServiceConnector() |
55 | { | 55 | { |