diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-03-18 21:51:27 +0200 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-03-18 21:51:27 +0200 |
| commit | 978bf16797921d60351c09d9fc45721cceceb6e9 (patch) | |
| tree | d143c224518bbc29592022c7a02dbb4670ec1abe | |
| parent | 00b8bdfe600d104207ebdba638cd3476dbc90174 (diff) | |
Related to EXT-5909 (Accepted/declined inventory offer shouldn't spawn chiclet).
- Removed unnecessary string in strings.xml and substituted it in code with existing one.
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index 08f874d1d2..47e60a966e 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -1532,7 +1532,7 @@ void LLToolDragAndDrop::logInventoryOffer(const LLUUID& to_agent, const LLUUID & std::string full_name; if (gCacheName->getFullName(to_agent, full_name)) { - LLIMModel::instance().logToFile(full_name, LLTrans::getString("SECOND_LIFE"), im_session_id, LLTrans::getString("inventory_item_offered")); + LLIMModel::instance().logToFile(full_name, LLTrans::getString("SECOND_LIFE"), im_session_id, LLTrans::getString("inventory_item_offered-im")); } } } diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 338612664a..4b9140ee90 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2915,7 +2915,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="IM_default_text_label">Click here to instant message.</string> <string name="IM_to_label">To</string> <string name="IM_moderator_label">(Moderator)</string> - <string name="inventory_item_offered">Inventory item offered</string> <!-- voice calls --> <string name="started_call">Started a voice call</string> |