aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelinventory.cpp
diff options
context:
space:
mode:
authorAleric Inglewood2010-11-07 18:38:46 +0100
committerAleric Inglewood2010-11-07 18:38:46 +0100
commit38d4ef2f26545c630fe80e7edc59b0a77641938a (patch)
tree9d2be8c4bd541e17c7ec83bcb5314b208c443715 /linden/indra/newview/llpanelinventory.cpp
parentIMP-692: SNOW-713: Global objects in libllcommon duplicated in plugins (diff)
downloadmeta-impy-38d4ef2f26545c630fe80e7edc59b0a77641938a.zip
meta-impy-38d4ef2f26545c630fe80e7edc59b0a77641938a.tar.gz
meta-impy-38d4ef2f26545c630fe80e7edc59b0a77641938a.tar.bz2
meta-impy-38d4ef2f26545c630fe80e7edc59b0a77641938a.tar.xz
IMP-692: SNOW-713: Fixed compile bug fixes.
Changes: * Added changes from snowglobe 1.5 to indra/llcommon/llstring.h (compile errors as a result of a missing include, but I copied everything else too). * Added #include "linden_common.h" to emeraldboobutils.cpp. Really it's one the header files that needed that, but that's how this header works: every source file should include it as first header anyway, then there is no need for other headers to do that. * Renamed LLPanelRegionOpenSettingsInfo::sendUpdate(void*) to LLPanelRegionOpenSettingsInfo::onClickOrs because it was hiding a virtual function (BOOL sendUpdate(void)). * Made cutToClipboard more equal to copyToClipboard (was also hiding a virtual function). * Install libllcommon.so in lib64 on Linux_x86_64, instead of lib.
Diffstat (limited to 'linden/indra/newview/llpanelinventory.cpp')
-rw-r--r--linden/indra/newview/llpanelinventory.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp
index 9cd2759..277ab15 100644
--- a/linden/indra/newview/llpanelinventory.cpp
+++ b/linden/indra/newview/llpanelinventory.cpp
@@ -145,7 +145,7 @@ public:
145 virtual void move(LLFolderViewEventListener* parent_listener); 145 virtual void move(LLFolderViewEventListener* parent_listener);
146 virtual BOOL isItemCopyable() const; 146 virtual BOOL isItemCopyable() const;
147 virtual BOOL copyToClipboard() const; 147 virtual BOOL copyToClipboard() const;
148 virtual void cutToClipboard(); 148 virtual BOOL cutToClipboard() const;
149 virtual BOOL isClipboardPasteable() const; 149 virtual BOOL isClipboardPasteable() const;
150 virtual void pasteFromClipboard(); 150 virtual void pasteFromClipboard();
151 virtual void buildContextMenu(LLMenuGL& menu, U32 flags); 151 virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
@@ -594,8 +594,9 @@ BOOL LLTaskInvFVBridge::copyToClipboard() const
594 return FALSE; 594 return FALSE;
595} 595}
596 596
597void LLTaskInvFVBridge::cutToClipboard() 597BOOL LLTaskInvFVBridge::cutToClipboard() const
598{ 598{
599 return FALSE;
599} 600}
600 601
601BOOL LLTaskInvFVBridge::isClipboardPasteable() const 602BOOL LLTaskInvFVBridge::isClipboardPasteable() const