diff options
| author | Melanie | 2010-03-03 02:07:03 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-03 02:07:03 +0000 |
| commit | 028a87fe37002e7a0611f66babf1deee46c83804 (patch) | |
| tree | 387aec499fd60c2012bed8148e6a2ddc847c3d95 /OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs | |
| parent | Revert "test" (diff) | |
| parent | Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff) | |
| download | opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs index b53a2fb..9869a99 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs | |||
| @@ -31,7 +31,6 @@ using OpenMetaverse; | |||
| 31 | using OpenMetaverse.Imaging; | 31 | using OpenMetaverse.Imaging; |
| 32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
| 33 | using OpenSim.Region.Framework.Interfaces; | 33 | using OpenSim.Region.Framework.Interfaces; |
| 34 | using OpenSim.Region.Framework.Scenes.Hypergrid; | ||
| 35 | using OpenSim.Services.Interfaces; | 34 | using OpenSim.Services.Interfaces; |
| 36 | using log4net; | 35 | using log4net; |
| 37 | using System.Reflection; | 36 | using System.Reflection; |