summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerparcelmgr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
-rw-r--r--indra/newview/llviewerparcelmgr.cpp17
1 files changed, 7 insertions, 10 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 4a76fe7142..61aa51a6d8 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -1230,28 +1230,27 @@ const LLString& LLViewerParcelMgr::getAgentParcelName() const
void LLViewerParcelMgr::sendParcelPropertiesUpdate(LLParcel* parcel, bool use_agent_region)
{
- if (!parcel) return;
+ if(!parcel) return;
LLViewerRegion *region = use_agent_region ? gAgent.getRegion() : LLWorld::getInstance()->getRegionFromPosGlobal( mWestSouth );
if (!region) return;
+ //llinfos << "found region: " << region->getName() << llendl;
LLSD body;
- std::string url = gAgent.getRegion()->getCapability("ParcelPropertiesUpdate");
+ std::string url = region->getCapability("ParcelPropertiesUpdate");
if (!url.empty())
{
- U32 message_flags = 0x01;
// request new properties update from simulator
+ U32 message_flags = 0x01;
body["flags"] = ll_sd_from_U32(message_flags);
parcel->packMessage(body);
-
- llinfos << "Sending parcel properties update via capability to:" << url << llendl;
-
+ llinfos << "Sending parcel properties update via capability to: "
+ << url << llendl;
LLHTTPClient::post(url, body, new LLHTTPClient::Responder());
}
else
{
- LLMessageSystem *msg = gMessageSystem;
-
+ LLMessageSystem* msg = gMessageSystem;
msg->newMessageFast(_PREHASH_ParcelPropertiesUpdate);
msg->nextBlockFast(_PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
@@ -1266,8 +1265,6 @@ void LLViewerParcelMgr::sendParcelPropertiesUpdate(LLParcel* parcel, bool use_ag
msg->sendReliable( region->getHost() );
}
-
-
}