diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-12 19:39:30 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-12 19:39:30 +0100 |
| commit | e2411ded41655d29af98f254aa5f322d0992bbad (patch) | |
| tree | 445adef1eaa5e444711c32d46d30562f842b6e5f /indra/newview/llscriptfloater.cpp | |
| parent | 379ca3c30830f6060637173147269dc0b2b58d27 (diff) | |
| parent | 265391fb3f88a97c5af868f3712bb7b06ad630c1 (diff) | |
merge from viewer-public
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"); |