diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-12 15:50:01 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-12 15:50:01 -0500 |
| commit | b8ac919d6fdf434c4c93ed60e85e14a0711ca4f8 (patch) | |
| tree | cb5926d357576b76f6f19f9c54470ece61f45d8f /indra/newview/llfloaterparcel.cpp | |
| parent | ae8c1d1ea87b524797b2986f853745c0a124246c (diff) | |
| parent | 7ca1bfc78d91fea8b5c77fec7ac8cb7fa72aee9b (diff) | |
merge
--HG--
branch : avatar-pipeline
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; } } |