From 5f8110a68ed2fdfe70e2dbd7363f1194b0f3e67d Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 14 Dec 2010 15:52:26 -0500
Subject: SH-439 FIX: track name requested in UI separately, so we can fall
 back to name from dae if needed

---
 indra/llprimitive/llmodel.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)
 mode change 100644 => 100755 indra/llprimitive/llmodel.cpp

(limited to 'indra/llprimitive/llmodel.cpp')

diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
old mode 100644
new mode 100755
index b486e17194..2a8505e16e
--- 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,
-- 
cgit v1.2.3