diff options
author | Aleric Inglewood | 2010-11-07 18:38:46 +0100 |
---|---|---|
committer | Aleric Inglewood | 2010-11-07 18:38:46 +0100 |
commit | 38d4ef2f26545c630fe80e7edc59b0a77641938a (patch) | |
tree | 9d2be8c4bd541e17c7ec83bcb5314b208c443715 /linden/indra/newview/llinventorybridge.h | |
parent | IMP-692: SNOW-713: Global objects in libllcommon duplicated in plugins (diff) | |
download | meta-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/llinventorybridge.h')
-rw-r--r-- | linden/indra/newview/llinventorybridge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llinventorybridge.h b/linden/indra/newview/llinventorybridge.h index 2004678..5a53aa5 100644 --- a/linden/indra/newview/llinventorybridge.h +++ b/linden/indra/newview/llinventorybridge.h | |||
@@ -221,7 +221,7 @@ public: | |||
221 | virtual void move(LLFolderViewEventListener* new_parent_bridge) {} | 221 | virtual void move(LLFolderViewEventListener* new_parent_bridge) {} |
222 | virtual BOOL isItemCopyable() const { return FALSE; } | 222 | virtual BOOL isItemCopyable() const { return FALSE; } |
223 | virtual BOOL copyToClipboard() const { return FALSE; } | 223 | virtual BOOL copyToClipboard() const { return FALSE; } |
224 | virtual void cutToClipboard() {} | 224 | virtual BOOL cutToClipboard() const { return FALSE; } |
225 | virtual BOOL isClipboardPasteable() const; | 225 | virtual BOOL isClipboardPasteable() const; |
226 | virtual void pasteFromClipboard() {} | 226 | virtual void pasteFromClipboard() {} |
227 | void getClipboardEntries(bool show_asset_id, std::vector<std::string> &items, | 227 | void getClipboardEntries(bool show_asset_id, std::vector<std::string> &items, |