Derive LLPanelPlace from LLRemoteParcelInfoObserver, and update affected sections to v-d.
This commit is contained in:
Lirusaito
@@ -39,7 +39,6 @@
|
||||
#include "message.h"
|
||||
#include "llui.h"
|
||||
#include "llsecondlifeurls.h"
|
||||
#include "llremoteparcelrequest.h"
|
||||
#include "llfloater.h"
|
||||
|
||||
#include "llagent.h"
|
||||
@@ -62,9 +61,6 @@
|
||||
|
||||
#include "hippogridmanager.h"
|
||||
|
||||
//static
|
||||
std::list<LLPanelPlace*> LLPanelPlace::sAllPanels;
|
||||
|
||||
LLPanelPlace::LLPanelPlace()
|
||||
: LLPanel(std::string("Places Panel")),
|
||||
mParcelID(),
|
||||
@@ -74,14 +70,14 @@ LLPanelPlace::LLPanelPlace()
|
||||
mPosRegion(),
|
||||
mAuctionID(0),
|
||||
mLandmarkAssetID()
|
||||
{
|
||||
sAllPanels.push_back(this);
|
||||
}
|
||||
{}
|
||||
|
||||
|
||||
LLPanelPlace::~LLPanelPlace()
|
||||
{
|
||||
sAllPanels.remove(this);
|
||||
if (mParcelID.isNull()) return;
|
||||
|
||||
LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mParcelID, this);
|
||||
}
|
||||
|
||||
|
||||
@@ -179,8 +175,14 @@ void LLPanelPlace::resetName(const std::string& name)
|
||||
|
||||
void LLPanelPlace::setParcelID(const LLUUID& parcel_id)
|
||||
{
|
||||
if (parcel_id.isNull()) return;
|
||||
|
||||
if(mParcelID.notNull())
|
||||
LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mParcelID, this);
|
||||
|
||||
mParcelID = parcel_id;
|
||||
sendParcelInfoRequest();
|
||||
LLRemoteParcelInfoProcessor::getInstance()->addObserver(mParcelID, this);
|
||||
LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(mParcelID);
|
||||
}
|
||||
|
||||
void LLPanelPlace::setSnapshot(const LLUUID& snapshot_id)
|
||||
@@ -199,23 +201,6 @@ void LLPanelPlace::setLandTypeString(const std::string& land_type)
|
||||
mLandTypeEditor->setText(land_type);
|
||||
}
|
||||
|
||||
void LLPanelPlace::sendParcelInfoRequest()
|
||||
{
|
||||
LLMessageSystem *msg = gMessageSystem;
|
||||
|
||||
if (mParcelID != mRequestedID)
|
||||
{
|
||||
msg->newMessage("ParcelInfoRequest");
|
||||
msg->nextBlockFast(_PREHASH_AgentData);
|
||||
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
|
||||
msg->addUUID("SessionID", gAgent.getSessionID());
|
||||
msg->nextBlock("Data");
|
||||
msg->addUUID("ParcelID", mParcelID);
|
||||
gAgent.sendReliableMessage();
|
||||
mRequestedID = mParcelID;
|
||||
}
|
||||
}
|
||||
|
||||
void LLPanelPlace::setErrorStatus(U32 status, const std::string& reason)
|
||||
{
|
||||
// We only really handle 404 and 499 errors
|
||||
@@ -231,141 +216,94 @@ void LLPanelPlace::setErrorStatus(U32 status, const std::string& reason)
|
||||
mDescEditor->setText(error_text);
|
||||
}
|
||||
|
||||
//static
|
||||
void LLPanelPlace::processParcelInfoReply(LLMessageSystem *msg, void **)
|
||||
void LLPanelPlace::processParcelInfo(const LLParcelData& parcel_data)
|
||||
{
|
||||
LLUUID agent_id;
|
||||
LLUUID parcel_id;
|
||||
LLUUID owner_id;
|
||||
std::string name;
|
||||
std::string desc;
|
||||
S32 actual_area;
|
||||
S32 billable_area;
|
||||
U8 flags;
|
||||
F32 global_x;
|
||||
F32 global_y;
|
||||
F32 global_z;
|
||||
std::string sim_name;
|
||||
LLUUID snapshot_id;
|
||||
F32 dwell;
|
||||
S32 sale_price;
|
||||
S32 auction_id;
|
||||
mAuctionID = parcel_data.auction_id;
|
||||
|
||||
msg->getUUID("AgentData", "AgentID", agent_id );
|
||||
msg->getUUID("Data", "ParcelID", parcel_id);
|
||||
|
||||
// look up all panels which have this avatar
|
||||
for (panel_list_t::iterator iter = sAllPanels.begin(); iter != sAllPanels.end(); ++iter)
|
||||
if (parcel_data.snapshot_id.notNull())
|
||||
{
|
||||
LLPanelPlace* self = *iter;
|
||||
if (self->mParcelID != parcel_id)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
msg->getUUID ("Data", "OwnerID", owner_id);
|
||||
msg->getString ("Data", "Name", name);
|
||||
msg->getString ("Data", "Desc", desc);
|
||||
msg->getS32 ("Data", "ActualArea", actual_area);
|
||||
msg->getS32 ("Data", "BillableArea", billable_area);
|
||||
msg->getU8 ("Data", "Flags", flags);
|
||||
msg->getF32 ("Data", "GlobalX", global_x);
|
||||
msg->getF32 ("Data", "GlobalY", global_y);
|
||||
msg->getF32 ("Data", "GlobalZ", global_z);
|
||||
msg->getString ("Data", "SimName", sim_name);
|
||||
msg->getUUID ("Data", "SnapshotID", snapshot_id);
|
||||
msg->getF32 ("Data", "Dwell", dwell);
|
||||
msg->getS32 ("Data", "SalePrice", sale_price);
|
||||
msg->getS32 ("Data", "AuctionID", auction_id);
|
||||
|
||||
|
||||
self->mAuctionID = auction_id;
|
||||
|
||||
if(snapshot_id.notNull())
|
||||
{
|
||||
self->mSnapshotCtrl->setImageAssetID(snapshot_id);
|
||||
}
|
||||
|
||||
// Only assign the name and description if they are not empty and there is not a
|
||||
// value present (passed in from a landmark, e.g.)
|
||||
|
||||
if( !name.empty()
|
||||
&& self->mNameEditor && self->mNameEditor->getText().empty())
|
||||
{
|
||||
self->mNameEditor->setText(name);
|
||||
}
|
||||
|
||||
if( !desc.empty()
|
||||
&& self->mDescEditor && self->mDescEditor->getText().empty())
|
||||
{
|
||||
self->mDescEditor->setText(desc);
|
||||
}
|
||||
|
||||
std::string info_text;
|
||||
LLUIString traffic = self->getString("traffic_text");
|
||||
traffic.setArg("[TRAFFIC]", llformat("%d ", (int)dwell));
|
||||
info_text = traffic;
|
||||
LLUIString area = self->getString("area_text");
|
||||
area.setArg("[AREA]", llformat("%d", actual_area));
|
||||
info_text += area;
|
||||
if (flags & DFQ_FOR_SALE)
|
||||
{
|
||||
LLUIString forsale = self->getString("forsale_text");
|
||||
forsale.setArg("[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
|
||||
forsale.setArg("[PRICE]", llformat("%d", sale_price));
|
||||
info_text += forsale;
|
||||
}
|
||||
if (auction_id != 0)
|
||||
{
|
||||
LLUIString auction = self->getString("auction_text");
|
||||
auction.setArg("[ID]", llformat("%010d ", auction_id));
|
||||
info_text += auction;
|
||||
}
|
||||
if (self->mInfoEditor)
|
||||
{
|
||||
self->mInfoEditor->setText(info_text);
|
||||
}
|
||||
|
||||
// HACK: Flag 0x2 == adult region,
|
||||
// Flag 0x1 == mature region, otherwise assume PG
|
||||
std::string rating = LLViewerRegion::accessToString(SIM_ACCESS_PG);
|
||||
if (flags & 0x2)
|
||||
{
|
||||
rating = LLViewerRegion::accessToString(SIM_ACCESS_ADULT);
|
||||
}
|
||||
else if (flags & 0x1)
|
||||
{
|
||||
rating = LLViewerRegion::accessToString(SIM_ACCESS_MATURE);
|
||||
}
|
||||
|
||||
// Just use given region position for display
|
||||
S32 region_x = llround(self->mPosRegion.mV[0]);
|
||||
S32 region_y = llround(self->mPosRegion.mV[1]);
|
||||
S32 region_z = llround(self->mPosRegion.mV[2]);
|
||||
|
||||
// If the region position is zero, grab position from the global
|
||||
if(self->mPosRegion.isExactlyZero())
|
||||
{
|
||||
region_x = llround(global_x) % REGION_WIDTH_UNITS;
|
||||
region_y = llround(global_y) % REGION_WIDTH_UNITS;
|
||||
region_z = llround(global_z);
|
||||
}
|
||||
|
||||
if(self->mPosGlobal.isExactlyZero())
|
||||
{
|
||||
self->mPosGlobal.setVec(global_x, global_y, global_z);
|
||||
}
|
||||
|
||||
std::string location = llformat("%s %d, %d, %d (%s)",
|
||||
sim_name.c_str(), region_x, region_y, region_z, rating.c_str());
|
||||
if (self->mLocationDisplay)
|
||||
{
|
||||
self->mLocationDisplay->setText(location);
|
||||
}
|
||||
|
||||
BOOL show_auction = (auction_id > 0);
|
||||
self->mAuctionBtn->setVisible(show_auction);
|
||||
setSnapshot(parcel_data.snapshot_id);
|
||||
}
|
||||
|
||||
// Only assign the name and description if they are not empty and there is not a
|
||||
// value present (passed in from a landmark, e.g.)
|
||||
|
||||
if( !parcel_data.name.empty()
|
||||
&& mNameEditor && mNameEditor->getText().empty())
|
||||
{
|
||||
mNameEditor->setText(parcel_data.name);
|
||||
}
|
||||
|
||||
if( !parcel_data.desc.empty()
|
||||
&& mDescEditor && mDescEditor->getText().empty())
|
||||
{
|
||||
mDescEditor->setText(parcel_data.desc);
|
||||
}
|
||||
|
||||
std::string info_text;
|
||||
LLUIString traffic = getString("traffic_text");
|
||||
traffic.setArg("[TRAFFIC]", llformat("%d ", (int)parcel_data.dwell));
|
||||
info_text = traffic;
|
||||
LLUIString area = getString("area_text");
|
||||
area.setArg("[AREA]", llformat("%d", parcel_data.actual_area));
|
||||
info_text += area;
|
||||
if (parcel_data.flags & DFQ_FOR_SALE)
|
||||
{
|
||||
LLUIString forsale = getString("forsale_text");
|
||||
forsale.setArg("[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
|
||||
forsale.setArg("[PRICE]", llformat("%d", parcel_data.sale_price));
|
||||
info_text += forsale;
|
||||
}
|
||||
if (parcel_data.auction_id != 0)
|
||||
{
|
||||
LLUIString auction = getString("auction_text");
|
||||
auction.setArg("[ID]", llformat("%010d ", parcel_data.auction_id));
|
||||
info_text += auction;
|
||||
}
|
||||
if (mInfoEditor)
|
||||
{
|
||||
mInfoEditor->setText(info_text);
|
||||
}
|
||||
|
||||
// HACK: Flag 0x2 == adult region,
|
||||
// Flag 0x1 == mature region, otherwise assume PG
|
||||
std::string rating = LLViewerRegion::accessToString(SIM_ACCESS_PG);
|
||||
if (parcel_data.flags & 0x2)
|
||||
{
|
||||
rating = LLViewerRegion::accessToString(SIM_ACCESS_ADULT);
|
||||
}
|
||||
else if (parcel_data.flags & 0x1)
|
||||
{
|
||||
rating = LLViewerRegion::accessToString(SIM_ACCESS_MATURE);
|
||||
}
|
||||
|
||||
// Just use given region position for display
|
||||
S32 region_x = llround(mPosRegion.mV[0]);
|
||||
S32 region_y = llround(mPosRegion.mV[1]);
|
||||
S32 region_z = llround(mPosRegion.mV[2]);
|
||||
|
||||
// If the region position is zero, grab position from the global
|
||||
if(mPosRegion.isExactlyZero())
|
||||
{
|
||||
region_x = llround(parcel_data.global_x) % REGION_WIDTH_UNITS;
|
||||
region_y = llround(parcel_data.global_y) % REGION_WIDTH_UNITS;
|
||||
region_z = llround(parcel_data.global_z);
|
||||
}
|
||||
|
||||
if(mPosGlobal.isExactlyZero())
|
||||
{
|
||||
mPosGlobal.setVec(parcel_data.global_x, parcel_data.global_y, parcel_data.global_z);
|
||||
}
|
||||
|
||||
std::string location = llformat("%s %d, %d, %d (%s)",
|
||||
parcel_data.sim_name.c_str(), region_x, region_y, region_z, rating.c_str());
|
||||
if (mLocationDisplay)
|
||||
{
|
||||
mLocationDisplay->setText(location);
|
||||
}
|
||||
|
||||
BOOL show_auction = (parcel_data.auction_id > 0);
|
||||
mAuctionBtn->setVisible(show_auction);
|
||||
}
|
||||
|
||||
|
||||
@@ -391,7 +329,7 @@ void LLPanelPlace::displayParcelInfo(const LLVector3& pos_region,
|
||||
U64 region_handle = to_region_handle(pos_global);
|
||||
body["region_handle"] = ll_sd_from_U64(region_handle);
|
||||
}
|
||||
LLHTTPClient::post(url, body, new LLRemoteParcelRequestResponder(this->getHandle()));
|
||||
LLHTTPClient::post(url, body, new LLRemoteParcelRequestResponder(this->getObserverHandle()));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user