diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-01-27 18:41:56 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-01-27 18:41:56 -0800 |
| commit | 84b7ff7915207dffad8da7aba959ab36bfa49c0f (patch) | |
| tree | 141b286cd1bdf810c5ba15131ad36ab5df3e196d /indra/newview/llplacesinventorybridge.cpp | |
| parent | 2cd7a7550991df90288aa4c7e2fbe2598cc3c296 (diff) | |
| parent | f53a72ec2c40ae04cee6dee2f58d76c5fedeca99 (diff) | |
Pull from viewer-experience
Diffstat (limited to 'indra/newview/llplacesinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llplacesinventorybridge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llplacesinventorybridge.cpp b/indra/newview/llplacesinventorybridge.cpp index 225ac6e224..fe4cc0f55f 100644 --- a/indra/newview/llplacesinventorybridge.cpp +++ b/indra/newview/llplacesinventorybridge.cpp @@ -89,7 +89,7 @@ void LLPlacesFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags) std::vector<std::string> items; std::vector<std::string> disabled_items; - LLInventoryPanel* inv_panel = dynamic_cast<LLInventoryPanel*>(mInventoryPanel.get()); + LLInventoryPanel* inv_panel = mInventoryPanel.get(); bool is_open = false; if (inv_panel) { @@ -137,7 +137,7 @@ void LLPlacesFolderBridge::performAction(LLInventoryModel* model, std::string ac LLFolderViewFolder* LLPlacesFolderBridge::getFolder() { LLFolderViewFolder* folder = NULL; - LLInventoryPanel* inv_panel = dynamic_cast<LLInventoryPanel*>(mInventoryPanel.get()); + LLInventoryPanel* inv_panel = mInventoryPanel.get(); if (inv_panel) { folder = dynamic_cast<LLFolderViewFolder*>(inv_panel->getRootFolder()->getItemByID(mUUID)); |