diff options
| author | James Cook <james@lindenlab.com> | 2009-12-11 10:22:50 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-11 10:22:50 -0800 |
| commit | a87b99cd950de20dc55e1ae6ce7186863a554326 (patch) | |
| tree | 43d1385397cbefac07934588824a3d0716fc6365 /indra/newview/llinventorybridge.h | |
| parent | b26694f2ab4d88fb8a0e4b1f0e8733f111af4522 (diff) | |
| parent | c74d5c483cbd75c5e2a0b17c8980755a9932c53a (diff) | |
Merge, fixed conflict in panel_preferences_sound.xml
Diffstat (limited to 'indra/newview/llinventorybridge.h')
| -rw-r--r-- | indra/newview/llinventorybridge.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index 63be9dcdb8..5e4e89a71b 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -377,6 +377,7 @@ public: protected: LLTextureBridge(LLInventoryPanel* inventory, const LLUUID& uuid, LLInventoryType::EType type) : LLItemBridge(inventory, uuid), mInvType(type) {} + bool canSaveTexture(void); LLInventoryType::EType mInvType; }; |