diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-06-30 17:07:03 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-06-30 17:07:03 -0400 |
| commit | 5436253e53da366fd81c12bd03fdb5565615b850 (patch) | |
| tree | 0755389a0b731e9920bc04e5293aabbe47296717 /indra/newview/llsidepaneliteminfo.cpp | |
| parent | 651bc81ffcad1b1dee60a05f5fa4ea26a7bb0871 (diff) | |
EXT-8047 FIXED In-world object contents' items show as "(inventory)" in item profile panel.
Easy fix.
Diffstat (limited to 'indra/newview/llsidepaneliteminfo.cpp')
| -rw-r--r-- | indra/newview/llsidepaneliteminfo.cpp | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp index 6ccd89dddb..d9870e81c5 100644 --- a/indra/newview/llsidepaneliteminfo.cpp +++ b/indra/newview/llsidepaneliteminfo.cpp @@ -323,6 +323,19 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item) childSetText("LabelOwnerName",getString("public")); } + //////////// + // ORIGIN // + //////////// + + if (object) + { + childSetText("origin",getString("origin_inworld")); + } + else + { + childSetText("origin",getString("origin_inventory")); + } + ////////////////// // ACQUIRE DATE // ////////////////// @@ -341,9 +354,9 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item) childSetText ("LabelAcquiredDate", timeStr); } - ///////////////////////////////////// - // PERMISSIONS AND SALE ITEM HIDING - ///////////////////////////////////// + ////////////////////////////////////// + // PERMISSIONS AND SALE ITEM HIDING // + ////////////////////////////////////// const std::string perm_and_sale_items[]={ "perms_inv", |