diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-11 19:17:37 +0200 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-11 19:17:37 +0200 |
commit | edcdaf27ceaf00cf075416ba196a25a89357a9d1 (patch) | |
tree | 4aff9e3eb53689da75f6ef5e087ff54b6c3bcade /indra/newview/llfloaterparcel.cpp | |
parent | e56dae206e4774e16003d1f404a6814fd81a04d3 (diff) | |
parent | 5f0b2624bc40c6c7580fa7c02f137c3dee330b94 (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfloaterparcel.cpp')
-rw-r--r-- | indra/newview/llfloaterparcel.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llfloaterparcel.cpp b/indra/newview/llfloaterparcel.cpp index 88a39a495f..e2be784116 100644 --- a/indra/newview/llfloaterparcel.cpp +++ b/indra/newview/llfloaterparcel.cpp @@ -40,6 +40,7 @@ // viewer project includes #include "llcommandhandler.h" #include "llpanelplace.h" +#include "llsidetray.h" // linden library includes #include "lluuid.h" @@ -70,7 +71,10 @@ public: { if (parcel_id.notNull()) { - LLFloaterReg::showInstance("parcel_info", LLSD(parcel_id)); + LLSD key; + key["type"] = "remote_place"; + key["id"] = parcel_id; + LLSideTray::getInstance()->showPanel("panel_places", key); return true; } } |