summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterparcel.cpp
diff options
context:
space:
mode:
authorSamuel Kolb <skolb@lindenlab.com>2009-12-15 10:05:42 -0800
committerSamuel Kolb <skolb@lindenlab.com>2009-12-15 10:05:42 -0800
commit82425a230c5ac7c0ca8a9ae55a1addadca9d99e9 (patch)
tree8705515b0bd2e699980fe832f2fe6739fb5ad895 /indra/newview/llfloaterparcel.cpp
parent941497dd30c409a2f352b0bfc1c48bfaca5ea76e (diff)
parent60e6fa139e8056288514cfa7276eee9133953de9 (diff)
Merge
Diffstat (limited to 'indra/newview/llfloaterparcel.cpp')
-rw-r--r--indra/newview/llfloaterparcel.cpp6
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;
}
}