From db0f5847ea8b96b3c1ac08e7aeb43d83daacb8e4 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Sat, 16 Feb 2008 00:57:46 +0000 Subject: svn merge -r 80024:80160 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-1-Server Port fixes for: * DEV-10609 Checkboxes in About Land untick when selected * Extend the sim node regex to support sim1-telstra.durga.lindenlab.com for colo testing. * Provide "version_valid" for each version when querying a channel * Update to latest eventlet r87, to handle multi-character terminators split across read buffers * DEV-10487 Log viewer stats sim and php fix * QAR-288: Pull in crash fixes from LSL bytecode parsing --- indra/newview/llviewerparcelmgr.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index e027588eaa..b5c2e81ab7 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -56,6 +56,7 @@ #include "llnotify.h" #include "llparcelselection.h" #include "llresmgr.h" +#include "llsdutil.h" #include "llstatusbar.h" #include "llui.h" #include "llviewerimage.h" @@ -1267,6 +1268,9 @@ void LLViewerParcelMgr::sendParcelPropertiesUpdate(LLParcel* parcel, bool use_ag std::string url = gAgent.getRegion()->getCapability("ParcelPropertiesUpdate"); if (!url.empty()) { + U32 message_flags = 0x01; + // request new properties update from simulator + body["flags"] = ll_sd_from_U32(message_flags); parcel->packMessage(body); llinfos << "Sending parcel properties update via capability to:" << url << llendl; @@ -1284,10 +1288,8 @@ void LLViewerParcelMgr::sendParcelPropertiesUpdate(LLParcel* parcel, bool use_ag msg->nextBlockFast(_PREHASH_ParcelData); msg->addS32Fast(_PREHASH_LocalID, parcel->getLocalID() ); - U32 flags = 0x0; - // request new properties update from simulator - flags |= 0x01; - msg->addU32("Flags", flags); + U32 message_flags = 0x01; + msg->addU32("Flags", message_flags); parcel->packMessage(msg); -- cgit v1.2.3