diff options
| author | Dave Parks <none@none> | 2010-06-07 23:05:22 -0500 |
|---|---|---|
| committer | Dave Parks <none@none> | 2010-06-07 23:05:22 -0500 |
| commit | f461ae214c8c998f5a0e3661696a30d27ad2814e (patch) | |
| tree | e9430d423ee46fad6cb8319575d37ec925b88e99 /indra/newview/llscriptfloater.cpp | |
| parent | 84e619a6dc9e5a5967c4ce035ac530a4588f72a5 (diff) | |
| parent | 48809cb3a9350a0357a0fc710140e2437f3e068e (diff) | |
Merge with render-pipeline
Diffstat (limited to 'indra/newview/llscriptfloater.cpp')
| -rw-r--r-- | indra/newview/llscriptfloater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp index 11b6c0a3ae..b68fc3b002 100644 --- a/indra/newview/llscriptfloater.cpp +++ b/indra/newview/llscriptfloater.cpp @@ -482,7 +482,7 @@ std::string LLScriptFloaterManager::getObjectName(const LLUUID& notification_id) text = notification->getSubstitutions()["OBJECTNAME"].asString(); break; case LLScriptFloaterManager::OBJ_GIVE_INVENTORY: - text = notification->getSubstitutions()["NAME"].asString(); + text = notification->getSubstitutions()["OBJECTFROMNAME"].asString(); break; default: text = LLTrans::getString("object"); |