summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorypanel.h
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-01-25 14:48:39 +0200
committerMike Antipov <mantipov@productengine.com>2010-01-25 14:48:39 +0200
commiteff95bbea9bb9234e9df9fca7f5bc033f1b99358 (patch)
treec390c131bffaa95f2c100941cce02ec20186c390 /indra/newview/llinventorypanel.h
parent088056c5bf4adc589c7fcc65236b90a466e59705 (diff)
parent7094921d1f235ff45cc5b3ef58b64c2812c8676f (diff)
Merge with default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llinventorypanel.h')
-rw-r--r--indra/newview/llinventorypanel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 09533b52f1..ccff795a51 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -123,7 +123,7 @@ public:
// Call this method to set the selection.
void openAllFolders();
void setSelection(const LLUUID& obj_id, BOOL take_keyboard_focus);
- void setSelectCallback(const LLFolderView::signal_t::slot_type& cb) { if (mFolders) mFolders->setSelectCallback(cb); }
+ void setSelectCallback(const LLFolderView::signal_t::slot_type& cb);
void clearSelection();
LLInventoryFilter* getFilter();
void setFilterTypes(U64 filter, LLInventoryFilter::EFilterType = LLInventoryFilter::FILTERTYPE_OBJECT);