diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 01:52:28 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 01:52:28 -0800 |
| commit | 2d7697dfade4ecbb8fbe9b26a5332fc9e93f5669 (patch) | |
| tree | 5e956b1e9bfc1efd65bcd365abac613b4d4baf04 /indra/llui/lluiimage.cpp | |
| parent | 5c73a908353cdd7210e3148f7162d30afab7873a (diff) | |
| parent | 6ea944b38f1e619df2c52283f6b33bbcc1cbbc40 (diff) | |
automated merge
Diffstat (limited to 'indra/llui/lluiimage.cpp')
| -rw-r--r-- | indra/llui/lluiimage.cpp | 4 |
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); } } |