Applied MJM's tree and grass pulldown list from the Hippo Viewer

1 files changed, 11 insertions, 3 deletions

diff --git a/linden/indra/newview/llvotree.cpp b/linden/indra/newview/llvotree.cpp
index 23c92ea..e1c3542 100644
--- a/linden/indra/newview/llvotree.cpp
+++ b/linden/indra/newview/llvotree.cpp
@@ -77,6 +77,9 @@ F32 LLVOTree::sTreeFactor = 1.f;
 LLVOTree::SpeciesMap LLVOTree::sSpeciesTable;
 S32 LLVOTree::sMaxTreeSpecies = 0;
 
+LLVOTree::SpeciesNames LLVOTree::sSpeciesNames;
+
+
 // Tree variables and functions
 
 LLVOTree::LLVOTree(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp):
@@ -230,11 +233,16 @@ void LLVOTree::initClass()
 
                         if (species >= sMaxTreeSpecies) sMaxTreeSpecies = species + 1;
 
+                        std::string name;
+                        static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
+                        success &= tree_def->getFastAttributeString(name_string, name);
+                        sSpeciesNames[name] = species;
+
                         if (!success)
                         {
-                                std::string name;
-                                static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
-                                tree_def->getFastAttributeString(name_string, name);
+                                //std::string name;
+                                //static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
+                                //tree_def->getFastAttributeString(name_string, name);
                                 llwarns << "Incomplete definition of tree " << name << llendl;
                         }
                 }