aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs8
6 files changed, 9 insertions, 11 deletions
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