summaryrefslogtreecommitdiff
path: root/indra/llui/llnotifications.cpp
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-12-05 11:23:37 -0800
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-12-05 11:23:37 -0800
commit54380ed6d7021b19281846b273fbe81a76c836d9 (patch)
tree9e3f2d33c70866eab669e79f0a4512002cf9eac4 /indra/llui/llnotifications.cpp
parent85e97f772e23c0595c4ce249f533cad746ddd3c6 (diff)
parentfc000880b40143534c47c475a7a0aba6ab75039e (diff)
Pull and merge ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
Diffstat (limited to 'indra/llui/llnotifications.cpp')
-rw-r--r--indra/llui/llnotifications.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index 61d5dcf12c..937dcf0afc 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -474,7 +474,8 @@ LLNotification::LLNotification(const LLSDParamAdapter<Params>& p) :
mCancelled(false),
mIgnored(false),
mResponderObj(NULL),
- mId(p.id.isProvided() ? p.id : LLUUID::generateNewID())
+ mId(p.id.isProvided() ? p.id : LLUUID::generateNewID()),
+ mOfferFromAgent(p.offer_from_agent)
{
if (p.functor.name.isChosen())
{