aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerparcelmgr.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:39 -0500
committerJacek Antonelli2008-08-15 23:45:39 -0500
commitfdb921e78b7b0e05f6e7e47e0c238bb87ee1afbc (patch)
tree3879991f681c965dce8040bb9deece680fc9f287 /linden/indra/newview/llviewerparcelmgr.cpp
parentSecond Life viewer sources 1.19.1.3 (diff)
downloadmeta-impy-fdb921e78b7b0e05f6e7e47e0c238bb87ee1afbc.zip
meta-impy-fdb921e78b7b0e05f6e7e47e0c238bb87ee1afbc.tar.gz
meta-impy-fdb921e78b7b0e05f6e7e47e0c238bb87ee1afbc.tar.bz2
meta-impy-fdb921e78b7b0e05f6e7e47e0c238bb87ee1afbc.tar.xz
Second Life viewer sources 1.19.1.4
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewerparcelmgr.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index de88ac0..ddc67d0 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -1259,28 +1259,30 @@ const LLString& LLViewerParcelMgr::getAgentParcelName() const
1259 1259
1260void LLViewerParcelMgr::sendParcelPropertiesUpdate(LLParcel* parcel, bool use_agent_region) 1260void LLViewerParcelMgr::sendParcelPropertiesUpdate(LLParcel* parcel, bool use_agent_region)
1261{ 1261{
1262 if (!parcel) return; 1262 if(!parcel) return;
1263 if(!gWorldp) return; 1263 if(!gWorldp) return;
1264 LLViewerRegion *region = use_agent_region ? gAgent.getRegion() : gWorldp->getRegionFromPosGlobal( mWestSouth ); 1264 //llinfos << "passed parcel: " << parcel->getName() << llendl;
1265
1266 LLViewerRegion* region = use_agent_region ?
1267 gAgent.getRegion() : gWorldp->getRegionFromPosGlobal( mWestSouth );
1265 if (!region) return; 1268 if (!region) return;
1269 //llinfos << "found region: " << region->getName() << llendl;
1266 1270
1267 LLSD body; 1271 LLSD body;
1268 std::string url = gAgent.getRegion()->getCapability("ParcelPropertiesUpdate"); 1272 std::string url = region->getCapability("ParcelPropertiesUpdate");
1269 if (!url.empty()) 1273 if (!url.empty())
1270 { 1274 {
1271 U32 message_flags = 0x01;
1272 // request new properties update from simulator 1275 // request new properties update from simulator
1276 U32 message_flags = 0x01;
1273 body["flags"] = ll_sd_from_U32(message_flags); 1277 body["flags"] = ll_sd_from_U32(message_flags);
1274 parcel->packMessage(body); 1278 parcel->packMessage(body);
1275 1279 llinfos << "Sending parcel properties update via capability to: "
1276 llinfos << "Sending parcel properties update via capability to:" << url << llendl; 1280 << url << llendl;
1277
1278 LLHTTPClient::post(url, body, new LLHTTPClient::Responder()); 1281 LLHTTPClient::post(url, body, new LLHTTPClient::Responder());
1279 } 1282 }
1280 else 1283 else
1281 { 1284 {
1282 LLMessageSystem *msg = gMessageSystem; 1285 LLMessageSystem* msg = gMessageSystem;
1283
1284 msg->newMessageFast(_PREHASH_ParcelPropertiesUpdate); 1286 msg->newMessageFast(_PREHASH_ParcelPropertiesUpdate);
1285 msg->nextBlockFast(_PREHASH_AgentData); 1287 msg->nextBlockFast(_PREHASH_AgentData);
1286 msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() ); 1288 msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
@@ -1295,8 +1297,6 @@ void LLViewerParcelMgr::sendParcelPropertiesUpdate(LLParcel* parcel, bool use_ag
1295 1297
1296 msg->sendReliable( region->getHost() ); 1298 msg->sendReliable( region->getHost() );
1297 } 1299 }
1298
1299
1300} 1300}
1301 1301
1302 1302