aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Grid/MessagingServer/Main.cs3
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs8
-rw-r--r--ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs1
3 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index bbf25f6..24f1cbc 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -163,8 +163,9 @@ namespace OpenSim.Grid.MessagingServer
163 } 163 }
164 } 164 }
165 165
166 public void Show(string ShowWhat) 166 public override void Show(string ShowWhat)
167 { 167 {
168 base.Show(ShowWhat);
168 } 169 }
169 } 170 }
170} 171}
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index fc3b1f4..d75ecaa 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -197,14 +197,14 @@ namespace SimpleApp
197 197
198 #region conscmd_callback Members 198 #region conscmd_callback Members
199 199
200 public void RunCmd(string cmd, string[] cmdparams) 200 public override void RunCmd(string cmd, string[] cmdparams)
201 { 201 {
202 throw new Exception("The method or operation is not implemented."); 202 base.RunCmd(cmd, cmdparams);
203 } 203 }
204 204
205 public void Show(string ShowWhat) 205 public override void Show(string ShowWhat)
206 { 206 {
207 throw new Exception("The method or operation is not implemented."); 207 base.Show(ShowWhat);
208 } 208 }
209 209
210 #endregion 210 #endregion
diff --git a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
index 981d96a..fa54035 100644
--- a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
+++ b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs
@@ -74,7 +74,6 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
74 private string serializeDir; 74 private string serializeDir;
75 75
76 private TcpServer mTcpServer; 76 private TcpServer mTcpServer;
77 private TcpClient mTcpClient;
78 77
79 public void Initialise(OpenSimMain openSim) 78 public void Initialise(OpenSimMain openSim)
80 { 79 {