summaryrefslogtreecommitdiff
path: root/indra/newview/llplacesinventorybridge.cpp
diff options
context:
space:
mode:
authorcallum <none@none>2012-01-27 13:18:56 -0800
committercallum <none@none>2012-01-27 13:18:56 -0800
commitf53a72ec2c40ae04cee6dee2f58d76c5fedeca99 (patch)
treee09f6db35a7c2f70fd8cdc45e105aec0f4bea9e0 /indra/newview/llplacesinventorybridge.cpp
parent987463d9248d7fab9534ff7a9f303c6db42da7a9 (diff)
parent13d510d5f2fa2d9bf654e70d9191f1909b1f299e (diff)
Merge with head
Diffstat (limited to 'indra/newview/llplacesinventorybridge.cpp')
-rw-r--r--indra/newview/llplacesinventorybridge.cpp4
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));