Revert a bunch of OpenJPEG changes. Add a few changes to the GetTextu…

…re CAP.
aurora-sim · Apr 3, 2011 · df3e704 · df3e704
1 parent 4c6408e
commit df3e704
Show file tree

Hide file tree

Showing 7 changed files with 1,522 additions and 1,519 deletions.
diff --git a/Aurora/Modules/Avatar/AbuseReports/AbuseReportsGUI/Abuse.cs b/Aurora/Modules/Avatar/AbuseReports/AbuseReportsGUI/Abuse.cs
@@ -132,9 +132,9 @@ public Image GetTexture(UUID TextureID)
 
             AssetBase asset = m_assetService.Get(TextureID.ToString());
             ManagedImage managedImage;
-            Image image;
-
-            if (asset != null && OpenJPEGDecoder.DecodeToImage(asset.Data, out managedImage, out image))
+            Image image;
+
+            if (asset != null && OpenJPEG.DecodeToImage(asset.Data, out managedImage, out image))
                 return image;
             else
                 return new Bitmap(1, 1);