diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-14 15:52:26 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-14 15:52:26 -0500 |
| commit | 5f8110a68ed2fdfe70e2dbd7363f1194b0f3e67d (patch) | |
| tree | a671f7f7a5e93a7fe63e200ede5467ecd26d8210 /indra/llprimitive/llmodel.cpp | |
| parent | 4351160958efa1c352e8af1ab3f48c1486ba9c5c (diff) | |
SH-439 FIX: track name requested in UI separately, so we can fall back to name from dae if needed
Diffstat (limited to 'indra/llprimitive/llmodel.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/llprimitive/llmodel.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index b486e17194..2a8505e16e 100644..100755 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -1324,6 +1324,14 @@ LLModel* LLModel::loadModelFromDomMesh(domMesh *mesh) return ret; } +std::string LLModel::getName() const +{ + if (!mRequestedLabel.empty()) + return mRequestedLabel; + else + return mLabel; +} + //static LLSD LLModel::writeModel( std::string filename, |