aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvotree.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llvotree.cpp')
-rw-r--r--linden/indra/newview/llvotree.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/linden/indra/newview/llvotree.cpp b/linden/indra/newview/llvotree.cpp
index 3fd5054..3523d87 100644
--- a/linden/indra/newview/llvotree.cpp
+++ b/linden/indra/newview/llvotree.cpp
@@ -78,6 +78,9 @@ F32 LLVOTree::sTreeFactor = 1.f;
78LLVOTree::SpeciesMap LLVOTree::sSpeciesTable; 78LLVOTree::SpeciesMap LLVOTree::sSpeciesTable;
79S32 LLVOTree::sMaxTreeSpecies = 0; 79S32 LLVOTree::sMaxTreeSpecies = 0;
80 80
81LLVOTree::SpeciesNames LLVOTree::sSpeciesNames;
82
83
81// Tree variables and functions 84// Tree variables and functions
82 85
83LLVOTree::LLVOTree(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp): 86LLVOTree::LLVOTree(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp):
@@ -232,11 +235,16 @@ void LLVOTree::initClass()
232 235
233 if (species >= sMaxTreeSpecies) sMaxTreeSpecies = species + 1; 236 if (species >= sMaxTreeSpecies) sMaxTreeSpecies = species + 1;
234 237
238 std::string name;
239 static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
240 success &= tree_def->getFastAttributeString(name_string, name);
241 sSpeciesNames[name] = species;
242
235 if (!success) 243 if (!success)
236 { 244 {
237 std::string name; 245 //std::string name;
238 static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name"); 246 //static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
239 tree_def->getFastAttributeString(name_string, name); 247 //tree_def->getFastAttributeString(name_string, name);
240 llwarns << "Incomplete definition of tree " << name << llendl; 248 llwarns << "Incomplete definition of tree " << name << llendl;
241 } 249 }
242 } 250 }