Merge remote branch 'armin/weekly' into weekly

5 files changed, 13 insertions, 7 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 70659f8..bd4e05c 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -422,7 +422,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <integer>Random</integer>
+    <string>Random</string>
   </map>
   <key>LastTree</key>
   <map>
@@ -433,7 +433,7 @@
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <integer>Random</integer>
+    <string>Random</string>
   </map>
   <key>LastSelectedGrid</key>
   <map>
diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp
index 703d233..cb02b09 100644
--- a/linden/indra/newview/llviewerimagelist.cpp
+++ b/linden/indra/newview/llviewerimagelist.cpp
@@ -156,7 +156,7 @@ void LLViewerImageList::doPreloadImages()
                 image->setAddressMode(LLTexUnit::TAM_WRAP);
                 mImagePreloads.insert(image);
         }
-        image = getImage(DEFAULT_WATER_NORMAL, MIPMAP_YES, IMMEDIATE_YES);
+        image = getImageFromFile(DEFAULT_WATER_NORMAL.asString()+".j2c", MIPMAP_YES, IMMEDIATE_YES,0,0,DEFAULT_WATER_NORMAL);
         if (image) 
         {
                 image->setAddressMode(LLTexUnit::TAM_WRAP);     
diff --git a/linden/indra/newview/llvograss.cpp b/linden/indra/newview/llvograss.cpp
index 08f2717..f738872 100644
--- a/linden/indra/newview/llvograss.cpp
+++ b/linden/indra/newview/llvograss.cpp
@@ -108,7 +108,9 @@ void LLVOGrass::updateSpecies()
                 SpeciesMap::const_iterator it = sSpeciesTable.begin();
                 mSpecies = (*it).first;
         }
-        setTEImage(0, gImageList.getImageFromFile(sSpeciesTable[mSpecies]->mTextureName));
+
+        LLViewerImage* grass_image = gImageList.getImageFromFile(sSpeciesTable[mSpecies]->mTextureName, TRUE, TRUE, 0, 0, sSpeciesTable[mSpecies]->mTextureID);
+        setTEImage(0, grass_image);
 }
 
 
@@ -162,13 +164,17 @@ void LLVOGrass::initClass()
 
                 GrassSpeciesData* newGrass = new GrassSpeciesData();
 
-
                 std::string textureName;
 
                 static LLStdStringHandle texture_name_string = LLXmlTree::addAttributeString("texture_name");
                 success &= grass_def->getFastAttributeString(texture_name_string, textureName);
                 newGrass->mTextureName = textureName;
 
+                std::string textureID;
+                static LLStdStringHandle texture_id = LLXmlTree::addAttributeString("texture_id");
+                success &= grass_def->getFastAttributeString(texture_id, textureID);
+                newGrass->mTextureID = LLUUID(textureID);
+
                 static LLStdStringHandle blade_sizex_string = LLXmlTree::addAttributeString("blade_size_x");
                 success &= grass_def->getFastAttributeF32(blade_sizex_string, F32_val);
                 newGrass->mBladeSizeX = F32_val;
diff --git a/linden/indra/newview/llvograss.h b/linden/indra/newview/llvograss.h
index 682fbdb..25fa04c 100644
--- a/linden/indra/newview/llvograss.h
+++ b/linden/indra/newview/llvograss.h
@@ -128,7 +128,7 @@ private:
         void updateSpecies();
         F32 mLastHeight;                // For cheap update hack
         S32 mNumBlades;
-
+//      LLPointer<LLViewerImage> mGrassImage;
         static SpeciesMap sSpeciesTable;
 };
 #endif // LL_VO_GRASS_
diff --git a/linden/indra/newview/llvotree.cpp b/linden/indra/newview/llvotree.cpp
index 208086f..0a7cc92 100644
--- a/linden/indra/newview/llvotree.cpp
+++ b/linden/indra/newview/llvotree.cpp
@@ -324,7 +324,7 @@ U32 LLVOTree::processUpdateMessage(LLMessageSystem *mesgsys,
         //
         //  Load Species-Specific data 
         //
-        mTreeImagep = gImageList.getImageFromFile(sSpeciesTable[mSpecies]->mTextureName);
+        mTreeImagep = gImageList.getImageFromFile(sSpeciesTable[mSpecies]->mTextureName, TRUE, TRUE, 0, 0, sSpeciesTable[mSpecies]->mTextureID);
         if (mTreeImagep)
         {
                 gGL.getTexUnit(0)->bind(mTreeImagep.get());