diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-04-23 13:24:09 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-23 13:24:09 -0700 |
| commit | a42dcc3f5e8dbddbc83500371bcb3d0ca8d91a3b (patch) | |
| tree | 3eafe790e4b51122d6d56c025856a8eb3ca36880 /indra/newview/llviewerinventory.cpp | |
| parent | e1b3919a4fec68f57be6d6de2839dc31b654609f (diff) | |
| parent | e82ed4e8761be902cf3a4d80c337e0cd44d41b17 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 444d397146..9ec9715819 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -926,6 +926,7 @@ void link_inventory_item( const LLUUID& item_id, const LLUUID& parent_id, const std::string& new_name, + const std::string& new_description, const LLAssetType::EType asset_type, LLPointer<LLInventoryCallback> cb) { @@ -951,7 +952,6 @@ void link_inventory_item( } LLUUID transaction_id; - std::string desc = "Broken link"; // This should only show if the object can't find its baseobj. LLInventoryType::EType inv_type = LLInventoryType::IT_NONE; if (dynamic_cast<const LLInventoryCategory *>(baseobj)) { @@ -982,7 +982,7 @@ void link_inventory_item( msg->addS8Fast(_PREHASH_Type, (S8)asset_type); msg->addS8Fast(_PREHASH_InvType, (S8)inv_type); msg->addStringFast(_PREHASH_Name, new_name); - msg->addStringFast(_PREHASH_Description, desc); + msg->addStringFast(_PREHASH_Description, new_description); } gAgent.sendReliableMessage(); } |