diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-10-18 15:38:33 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-10-18 15:38:33 -0400 |
| commit | 8e30a2f06dd1ce407fcb2399823efed883b317d2 (patch) | |
| tree | e5b22fb9fd2b5e99cf195d00338da57ecdade0d4 /indra/llprimitive | |
| parent | 7df153e352ce50ded382df020cc3696b8c1b9325 (diff) | |
| parent | 086c1342152895da28d2e0130d09432152604ca8 (diff) | |
merge changes for 4.1.1-release
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/lldaeloader.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp index 720986a411..00bde8dbc3 100644 --- a/indra/llprimitive/lldaeloader.cpp +++ b/indra/llprimitive/lldaeloader.cpp @@ -2235,7 +2235,11 @@ std::string LLDAELoader::getElementLabel(daeElement *element) // retrieve index to distinguish items inside same parent size_t ind = 0; parent->getChildren().find(element, ind); - index_string = "_" + boost::lexical_cast<std::string>(ind); + + if (ind > 0) + { + index_string = "_" + boost::lexical_cast<std::string>(ind); + } // if parent has a name or ID, use it std::string name = parent->getAttribute("name"); |