diff options
author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2010-03-19 15:54:01 +0200 |
---|---|---|
committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2010-03-19 15:54:01 +0200 |
commit | 5fa1c1531bbeb23aa76ba605fb7bd30b3f51c6dd (patch) | |
tree | a9a354c260d649fd2ebc862b1703666b688c0461 /indra/newview/llviewermessage.h | |
parent | 37812054480843bca8e9016e3f816e9fdee6e7d3 (diff) | |
parent | 97a35b487545572ce9409e06bd54ad29f0da7114 (diff) |
Automated merge with https://hg.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewermessage.h')
-rw-r--r-- | indra/newview/llviewermessage.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.h b/indra/newview/llviewermessage.h index 7dd629dcfd..88f9697037 100644 --- a/indra/newview/llviewermessage.h +++ b/indra/newview/llviewermessage.h @@ -215,6 +215,8 @@ struct LLOfferInfo mIM(IM_NOTHING_SPECIAL), mType(LLAssetType::AT_NONE) {}; LLOfferInfo(const LLSD& sd); + LLOfferInfo(const LLOfferInfo& info); + void forceResponse(InventoryOfferResponse response); EInstantMessage mIM; |