diff options
author | Merov Linden <merov@lindenlab.com> | 2012-06-07 22:30:54 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-06-07 22:30:54 -0700 |
commit | bc54f1bb89452467ca8b652e4b961444d9c4be8d (patch) | |
tree | b5aac588bc7ec1506456eaf5967e9a7930b42fc0 /indra/newview/llpanelobjectinventory.cpp | |
parent | 05d721cecfa0c20a6fd8498a18f36cde7014248e (diff) | |
parent | a519e34f02b4b2663fe082ba9ad12f1b423669cb (diff) |
Merge : pull from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
-rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 1efd1c3d9c..f84d6e5cc1 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -124,7 +124,7 @@ public: virtual void move(LLFolderViewEventListener* parent_listener); virtual BOOL isItemCopyable() const; virtual BOOL copyToClipboard() const; - virtual void cutToClipboard(); + virtual BOOL cutToClipboard() const; virtual BOOL isClipboardPasteable() const; virtual void pasteFromClipboard(); virtual void pasteLinkFromClipboard(); @@ -524,8 +524,9 @@ BOOL LLTaskInvFVBridge::copyToClipboard() const return FALSE; } -void LLTaskInvFVBridge::cutToClipboard() +BOOL LLTaskInvFVBridge::cutToClipboard() const { + return FALSE; } BOOL LLTaskInvFVBridge::isClipboardPasteable() const @@ -1561,7 +1562,7 @@ void LLPanelObjectInventory::reset() scroll_p.rect(scroller_rect); scroll_p.tab_stop(true); scroll_p.follows.flags(FOLLOWS_ALL); - mScroller = LLUICtrlFactory::create<LLScrollContainer>(scroll_p); + mScroller = LLUICtrlFactory::create<LLFolderViewScrollContainer>(scroll_p); addChild(mScroller); mScroller->addChild(mFolders); |