Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge back the ability to select the tree (not just random, from Imprudence).

Browse Source 
Conflicts:

	indra/newview/app_settings/settings.xml
	indra/newview/llfloatertools.cpp
This commit is contained in:
Siana Gearz
2011-10-04 06:07:52 +02:00
parent 2cba3c45bd
commit 0a9c611dfd
9 changed files with 144 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llvotree.cpp
View File

@@ -83,6 +83,8 @@ 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):
@@ -242,6 +244,11 @@ void LLVOTree::initClass()
sSpeciesTable[species] = newTree;
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)
{