diff options
| author | Melanie Thielker | 2009-05-04 20:15:39 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2009-05-04 20:15:39 +0000 |
| commit | acfb5051cd328ab21aba5bfc2878ce84d496a7f1 (patch) | |
| tree | e828f8688de36d91c1917a02b651939580168125 /OpenSim/Region/CoreModules/Framework | |
| parent | * Resolve http://opensimulator.org/mantis/view.php?id=3573 (diff) | |
| download | opensim-SC_OLD-acfb5051cd328ab21aba5bfc2878ce84d496a7f1.zip opensim-SC_OLD-acfb5051cd328ab21aba5bfc2878ce84d496a7f1.tar.gz opensim-SC_OLD-acfb5051cd328ab21aba5bfc2878ce84d496a7f1.tar.bz2 opensim-SC_OLD-acfb5051cd328ab21aba5bfc2878ce84d496a7f1.tar.xz | |
Intermediate commit. WILL NOT COMPILE!
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
3 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs index 32a4e6f..2d0ed47 100644 --- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs | |||
| @@ -38,6 +38,7 @@ using OpenMetaverse.Packets; | |||
| 38 | using OpenMetaverse.StructuredData; | 38 | using OpenMetaverse.StructuredData; |
| 39 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
| 40 | using OpenSim.Framework.Servers; | 40 | using OpenSim.Framework.Servers; |
| 41 | using OpenSim.Framework.Servers.HttpServer; | ||
| 41 | using OpenSim.Region.Framework.Interfaces; | 42 | using OpenSim.Region.Framework.Interfaces; |
| 42 | using OpenSim.Region.Framework.Scenes; | 43 | using OpenSim.Region.Framework.Scenes; |
| 43 | using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>; | 44 | using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>; |
diff --git a/OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs b/OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs index dd0223a..e738560 100644 --- a/OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs +++ b/OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs | |||
| @@ -34,7 +34,7 @@ using OpenSim.Framework; | |||
| 34 | using OpenSim.Framework.Communications; | 34 | using OpenSim.Framework.Communications; |
| 35 | using OpenSim.Framework.Communications.Cache; | 35 | using OpenSim.Framework.Communications.Cache; |
| 36 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
| 37 | using OpenSim.Framework.Servers.Interfaces; | 37 | using OpenSim.Framework.Servers.HttpServer; |
| 38 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
| 39 | using OpenSim.Region.Framework.Scenes; | 39 | using OpenSim.Region.Framework.Scenes; |
| 40 | 40 | ||
diff --git a/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs b/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs index fb33dea..5266e0a 100644 --- a/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs +++ b/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs | |||
| @@ -36,7 +36,7 @@ using OpenSim.Data; | |||
| 36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
| 37 | using OpenSim.Framework.Communications; | 37 | using OpenSim.Framework.Communications; |
| 38 | using OpenSim.Framework.Communications.Cache; | 38 | using OpenSim.Framework.Communications.Cache; |
| 39 | using OpenSim.Framework.Servers.Interfaces; | 39 | using OpenSim.Framework.Servers.HttpServer; |
| 40 | using OpenSim.Region.Framework.Interfaces; | 40 | using OpenSim.Region.Framework.Interfaces; |
| 41 | using OpenSim.Region.Framework.Scenes; | 41 | using OpenSim.Region.Framework.Scenes; |
| 42 | 42 | ||