diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-06-08 14:55:19 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-06-08 14:55:19 -0500 |
| commit | 22102e41cbf4ce9e1c0d069f111849466e297520 (patch) | |
| tree | a74a2973715fbe90e7835e04ac4250c68ca0ab79 /indra/newview | |
| parent | ba454baab38d6e782338156dfbc97f7168710df2 (diff) | |
Merge cleanup.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llinventorybridge.h | 1 | ||||
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 8fdb965cf2..78789eb9ce 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -109,7 +109,6 @@ bool move_task_inventory_callback(const LLSD& notification, const LLSD& response bool confirm_replace_attachment_rez(const LLSD& notification, const LLSD& response); void teleport_via_landmark(const LLUUID& asset_id); - "Inv_Mesh", // +=================================================+ // | LLInvFVBridge | // +=================================================+ @@ -918,7 +917,7 @@ LLInvFVBridge* LLInvFVBridge::createBridge(LLAssetType::EType asset_type, // Only should happen for broken links. new_listener = new LLLinkItemBridge(inventory, root, uuid); break; - case LLAssetType::AT_MESH: + case LLAssetType::AT_MESH: if(!(inv_type == LLInventoryType::IT_MESH)) { llwarns << LLAssetType::lookup(asset_type) << " asset has inventory type " << LLInventoryType::lookupHumanReadable(inv_type) << " on uuid " << uuid << llendl; diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index f7a06477a3..d637fc6e36 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -183,7 +183,6 @@ public: U32 flags = 0x00) const; }; - MESH_ICON_NAME, class LLItemBridge : public LLInvFVBridge { public: diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 0d70151688..898cabb03d 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1268,7 +1268,7 @@ LLTaskMeshBridge::LLTaskMeshBridge( LLUIImagePtr LLTaskMeshBridge::getIcon() const { - return get_item_icon(LLAssetType::AT_MESH, LLInventoryType::IT_MESH, 0, FALSE); + return LLInventoryIcon::getIcon(LLAssetType::AT_MESH, LLInventoryType::IT_MESH, 0, FALSE); } void LLTaskMeshBridge::openItem() diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index e473461622..dd65ca2d25 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -66,6 +66,7 @@ #include "llappviewer.h" #include "lluploaddialog.h" #include "lltrans.h" +#include "llfloaterbuycurrency.h" #include "llfloaterimportcollada.h" // linden libraries |