aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/MainConsole.cs
diff options
context:
space:
mode:
authorMelanie2011-10-26 17:55:53 +0200
committerMelanie2011-10-26 17:55:53 +0200
commitc763419043773c93dbbc865ec35f7ecf856a641a (patch)
treeac9f99c33ae788e6b7fdfd0843c2ae584a896dc6 /OpenSim/Framework/MainConsole.cs
parentFix a missing locking call (diff)
parentMerge branch 'master' into bigmerge (diff)
downloadopensim-SC-c763419043773c93dbbc865ec35f7ecf856a641a.zip
opensim-SC-c763419043773c93dbbc865ec35f7ecf856a641a.tar.gz
opensim-SC-c763419043773c93dbbc865ec35f7ecf856a641a.tar.bz2
opensim-SC-c763419043773c93dbbc865ec35f7ecf856a641a.tar.xz
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/MainConsole.cs (renamed from OpenSim/Framework/Console/MainConsole.cs)6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Console/MainConsole.cs b/OpenSim/Framework/MainConsole.cs
index 24be617..4527b68 100644
--- a/OpenSim/Framework/Console/MainConsole.cs
+++ b/OpenSim/Framework/MainConsole.cs
@@ -25,13 +25,13 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Framework.Console 28namespace OpenSim.Framework
29{ 29{
30 public class MainConsole 30 public class MainConsole
31 { 31 {
32 private static CommandConsole instance; 32 private static ICommandConsole instance;
33 33
34 public static CommandConsole Instance 34 public static ICommandConsole Instance
35 { 35 {
36 get { return instance; } 36 get { return instance; }
37 set { instance = value; } 37 set { instance = value; }