diff options
author | Rick Pasetto <rick@lindenlab.com> | 2010-01-22 10:02:13 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-22 10:02:13 -0800 |
commit | fa891c062ef66410123c66de1ef67b7dcef327db (patch) | |
tree | d0badf37ffd261c6732744be03ab76cabf523c5e /indra/newview/llinventorybridge.cpp | |
parent | 84dfa02baf4aff336ec467acbe647618e9b4b21a (diff) | |
parent | dc47f52e9f5ab095737fedf68d22c8228140c71b (diff) |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r-- | indra/newview/llinventorybridge.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 099f863dc9..1b1f615a57 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -5070,8 +5070,12 @@ void LLLandmarkBridgeAction::doIt() // Opening (double-clicking) a landmark immediately teleports, // but warns you the first time. LLSD payload; - payload["asset_id"] = item->getAssetUUID(); - LLNotificationsUtil::add("TeleportFromLandmark", LLSD(), payload); + payload["asset_id"] = item->getAssetUUID(); + + LLSD args; + args["LOCATION"] = item->getDisplayName(); + + LLNotificationsUtil::add("TeleportFromLandmark", args, payload); } LLInvFVBridgeAction::doIt(); |