diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-05-12 16:46:58 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-05-12 16:46:58 -0400 |
| commit | 86f6827bf9073fbe533b63a8894d6a49824411a3 (patch) | |
| tree | 2dc6aaece6ecc845b2bf375f148713e28da0660d /indra/newview/llscriptfloater.cpp | |
| parent | ee53b612fb44b158c10fd949f223f80905a37ce4 (diff) | |
| parent | 265391fb3f88a97c5af868f3712bb7b06ad630c1 (diff) | |
automated merge
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"); |