diff options
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Framework/Watchdog.cs
Diffstat (limited to '')
| -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 | { |