diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-02 11:29:03 -0500 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-02 11:29:03 -0500 |
commit | c40ed43535164c3b80afd34bdb1de211eb023458 (patch) | |
tree | 3722435d89e460d046c3355d76dd106052efb61f /indra/newview/llpanellandmarks.cpp | |
parent | 5642d7d0122da91d8ef23f8adb069cc82e0c4ed4 (diff) | |
parent | f496c2b164a100836d74909c3e27adcdf98018f0 (diff) |
merging in viewer-2 into avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
-rw-r--r-- | indra/newview/llpanellandmarks.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index 413d8ed756..3af18bb751 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -596,11 +596,11 @@ void LLLandmarksPanel::onAddAction(const LLSD& userdata) const if(landmark) { LLSideTray::getInstance()->showPanel("panel_places", - LLSD().insert("type", "landmark").insert("id",landmark->getUUID())); + LLSD().with("type", "landmark").with("id",landmark->getUUID())); } else { - LLSideTray::getInstance()->showPanel("panel_places", LLSD().insert("type", "create_landmark")); + LLSideTray::getInstance()->showPanel("panel_places", LLSD().with("type", "create_landmark")); } } else if ("category" == command_name) |