Load other missing UUIDs from OpenSim from file instead

1 files changed, 16 insertions, 4 deletions

diff --git a/linden/indra/newview/llvlcomposition.cpp b/linden/indra/newview/llvlcomposition.cpp
index e12504c..535c504 100644
--- a/linden/indra/newview/llvlcomposition.cpp
+++ b/linden/indra/newview/llvlcomposition.cpp
@@ -72,10 +72,11 @@ LLVLComposition::LLVLComposition(LLSurface *surfacep, const U32 width, const F32
         mSurfacep = surfacep;
 
         // Load Terrain Textures - Original ones
-        setDetailTextureID(0, TERRAIN_DIRT_DETAIL);
-        setDetailTextureID(1, TERRAIN_GRASS_DETAIL);
-        setDetailTextureID(2, TERRAIN_MOUNTAIN_DETAIL);
-        setDetailTextureID(3, TERRAIN_ROCK_DETAIL);
+        // Load from file as OpenSim-based grids don't include these yet -- MC
+        setDetailTextureID(0, TERRAIN_DIRT_DETAIL.asString()+".j2c", TRUE, TRUE);
+        setDetailTextureID(1, TERRAIN_GRASS_DETAIL.asString()+".j2c", TRUE, TRUE);
+        setDetailTextureID(2, TERRAIN_MOUNTAIN_DETAIL.asString()+".j2c", TRUE, TRUE);
+        setDetailTextureID(3, TERRAIN_ROCK_DETAIL.asString()+".j2c", TRUE, TRUE);
 
         // Initialize the texture matrix to defaults.
         for (S32 i = 0; i < CORNER_COUNT; ++i)
@@ -111,6 +112,17 @@ void LLVLComposition::setDetailTextureID(S32 corner, const LLUUID& id)
         mRawImages[corner] = NULL;
 }
 
+void LLVLComposition::setDetailTextureID(S32 corner, const std::string& filename, const bool& usemipmap, const bool& levelimmediate)
+{
+        if(filename.empty())
+        {
+                return;
+        }
+        mDetailTextures[corner] = gImageList.getImageFromFile(filename, usemipmap, levelimmediate);
+        mDetailTextures[corner]->setNoDelete() ;
+        mRawImages[corner] = NULL;
+}
+
 BOOL LLVLComposition::generateHeights(const F32 x, const F32 y,
                                                                           const F32 width, const F32 height)
 {