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/Framework/RegionInfo.cs | |
| 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/Framework/RegionInfo.cs')
| -rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index b0202fb..db6c26f 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
| @@ -36,7 +36,7 @@ using log4net; | |||
| 36 | using Nini.Config; | 36 | using Nini.Config; |
| 37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
| 38 | using OpenMetaverse.StructuredData; | 38 | using OpenMetaverse.StructuredData; |
| 39 | using OpenSim.Framework.Console; | 39 | //using OpenSim.Framework.Console; |
| 40 | 40 | ||
| 41 | namespace OpenSim.Framework | 41 | namespace OpenSim.Framework |
| 42 | { | 42 | { |