summaryrefslogtreecommitdiff
path: root/indra/llui/lluiimage.cpp
diff options
context:
space:
mode:
authorgabriel lee <gabriel@lindenlab.com>2010-02-02 10:58:47 +0000
committergabriel lee <gabriel@lindenlab.com>2010-02-02 10:58:47 +0000
commit95d0df4ab05c4cfcc78f684ab28d36b9cc84410e (patch)
treeb1621cd22044edade98019af9d1b77383e3b88ef /indra/llui/lluiimage.cpp
parent5dfdb0d5a41143512180390193ce79644bcb9469 (diff)
parent4ad357ec70e15afdfe78816990cb23c7ba17619c (diff)
merged back my last changes
Diffstat (limited to 'indra/llui/lluiimage.cpp')
-rw-r--r--indra/llui/lluiimage.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lluiimage.cpp b/indra/llui/lluiimage.cpp
index 966d919dc7..8cd6460b66 100644
--- a/indra/llui/lluiimage.cpp
+++ b/indra/llui/lluiimage.cpp
@@ -182,11 +182,11 @@ namespace LLInitParam
{
if (mData.mValue == NULL)
{
- name = "none";
+ name.set("none", false);
}
else
{
- name = mData.mValue->getName();
+ name.set(mData.mValue->getName(), false);
}
}