diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-06 15:12:22 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-06 15:12:22 +0100 |
| commit | 1de148608699e85a893e9e4e4ebf6e9c851d8f58 (patch) | |
| tree | bd75b737c7bc5a334f3c0bf9358d085bdac9a3cf /indra/newview | |
| parent | 8f16be49dc86f0fca228b09ce0b788ad03482888 (diff) | |
more fixing from the viewer-trunk merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llinventorybridge.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 182629d2da..5c0898407e 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -997,7 +997,7 @@ LLInvFVBridge* LLInvFVBridge::createBridge(LLAssetType::EType asset_type, { llwarns << LLAssetType::lookup(asset_type) << " asset has inventory type " << safe_inv_type_lookup(inv_type) << " on uuid " << uuid << llendl; } - new_listener = new LLMeshBridge(inventory, uuid); + new_listener = new LLMeshBridge(inventory, root, uuid); break; default: diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index d5e4da41e4..75b206f3b7 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -640,8 +640,10 @@ public: virtual void buildContextMenu(LLMenuGL& menu, U32 flags); protected: - LLMeshBridge(LLInventoryPanel* inventory, const LLUUID& uuid) : - LLItemBridge(inventory, uuid) {} + LLMeshBridge(LLInventoryPanel* inventory, + LLFolderView* root, + const LLUUID& uuid) : + LLItemBridge(inventory, root, uuid) {} }; |