diff options
| author | Melanie | 2011-10-26 17:55:53 +0200 |
|---|---|---|
| committer | Melanie | 2011-10-26 17:55:53 +0200 |
| commit | c763419043773c93dbbc865ec35f7ecf856a641a (patch) | |
| tree | ac9f99c33ae788e6b7fdfd0843c2ae584a896dc6 /OpenSim/ConsoleClient | |
| parent | Fix a missing locking call (diff) | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| download | opensim-SC_OLD-c763419043773c93dbbc865ec35f7ecf856a641a.zip opensim-SC_OLD-c763419043773c93dbbc865ec35f7ecf856a641a.tar.gz opensim-SC_OLD-c763419043773c93dbbc865ec35f7ecf856a641a.tar.bz2 opensim-SC_OLD-c763419043773c93dbbc865ec35f7ecf856a641a.tar.xz | |
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to 'OpenSim/ConsoleClient')
| -rw-r--r-- | OpenSim/ConsoleClient/ConsoleClient.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/ConsoleClient/ConsoleClient.cs b/OpenSim/ConsoleClient/ConsoleClient.cs index f4605da..7c003ea 100644 --- a/OpenSim/ConsoleClient/ConsoleClient.cs +++ b/OpenSim/ConsoleClient/ConsoleClient.cs | |||
| @@ -33,6 +33,7 @@ using System.IO; | |||
| 33 | using System.Xml; | 33 | using System.Xml; |
| 34 | using System.Collections.Generic; | 34 | using System.Collections.Generic; |
| 35 | using OpenSim.Server.Base; | 35 | using OpenSim.Server.Base; |
| 36 | using OpenSim.Framework; | ||
| 36 | using OpenSim.Framework.Console; | 37 | using OpenSim.Framework.Console; |
| 37 | using OpenMetaverse; | 38 | using OpenMetaverse; |
| 38 | 39 | ||