diff options
Diffstat (limited to 'linden/indra/newview/llvograss.cpp')
-rw-r--r-- | linden/indra/newview/llvograss.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/linden/indra/newview/llvograss.cpp b/linden/indra/newview/llvograss.cpp index 4e7816c..79addbb 100644 --- a/linden/indra/newview/llvograss.cpp +++ b/linden/indra/newview/llvograss.cpp | |||
@@ -71,6 +71,8 @@ F32 w_mod[GRASS_MAX_BLADES]; // Factor to modulate wind movement by to rand | |||
71 | LLVOGrass::SpeciesMap LLVOGrass::sSpeciesTable; | 71 | LLVOGrass::SpeciesMap LLVOGrass::sSpeciesTable; |
72 | S32 LLVOGrass::sMaxGrassSpecies = 0; | 72 | S32 LLVOGrass::sMaxGrassSpecies = 0; |
73 | 73 | ||
74 | LLVOGrass::SpeciesNames LLVOGrass::sSpeciesNames; | ||
75 | |||
74 | 76 | ||
75 | LLVOGrass::LLVOGrass(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp) | 77 | LLVOGrass::LLVOGrass(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp) |
76 | : LLAlphaObject(id, pcode, regionp) | 78 | : LLAlphaObject(id, pcode, regionp) |
@@ -201,11 +203,16 @@ void LLVOGrass::initClass() | |||
201 | 203 | ||
202 | if (species >= sMaxGrassSpecies) sMaxGrassSpecies = species + 1; | 204 | if (species >= sMaxGrassSpecies) sMaxGrassSpecies = species + 1; |
203 | 205 | ||
206 | std::string name; | ||
207 | static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name"); | ||
208 | success &= grass_def->getFastAttributeString(name_string, name); | ||
209 | sSpeciesNames[name] = species; | ||
210 | |||
204 | if (!success) | 211 | if (!success) |
205 | { | 212 | { |
206 | std::string name; | 213 | /*std::string name; |
207 | static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name"); | 214 | static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name"); |
208 | grass_def->getFastAttributeString(name_string, name); | 215 | grass_def->getFastAttributeString(name_string, name);*/ |
209 | llwarns << "Incomplete definition of grass " << name << llendl; | 216 | llwarns << "Incomplete definition of grass " << name << llendl; |
210 | } | 217 | } |
211 | } | 218 | } |