livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0

meow-7.2.2
Lynx Linden 2009-12-11 11:31:00 +00:00
parent cc8305cd20 3c96173fce
commit 9f0e4f6683
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llfloaterparcel.cpp
View File

@ -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;
}
}

16
indra/newview/llpanelplaces.cpp
View File

@ -278,12 +278,20 @@ void LLPanelPlaces::onOpen(const LLSD& key)
}
else if (mPlaceInfoType == REMOTE_PLACE_INFO_TYPE)
{
mPosGlobal = LLVector3d(key["x"].asReal(),
key["y"].asReal(),
key["z"].asReal());
if (key.has("id"))
{
LLUUID parcel_id = key["id"].asUUID();
mPlaceProfile->setParcelID(parcel_id);
}
else
{
mPosGlobal = LLVector3d(key["x"].asReal(),
key["y"].asReal(),
key["z"].asReal());
mPlaceProfile->displayParcelInfo(LLUUID(), mPosGlobal);
}
mPlaceProfile->setInfoType(LLPanelPlaceInfo::PLACE);
mPlaceProfile->displayParcelInfo(LLUUID(), mPosGlobal);
}
else if (mPlaceInfoType == TELEPORT_HISTORY_INFO_TYPE)
{

2
indra/newview/skins/default/xui/en/floater_buy_currency.xml
View File

@ -222,7 +222,7 @@
width="300"
height="30"
name="currency_links">
[http://www.secondlife.com/ payment method] | [http://www.secondlife.com/ currency] | [http://www.secondlife.com exchange rate]
[http://www.secondlife.com/ payment method] | [http://www.secondlife.com/ currency] | [http://www.secondlife.com/my/account/exchange_rates.php exchange rate]
</text>
<text
type="string"