From 2d9afdaa03f0d44d05e3f2fb9d99dd5b059a9cac Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Tue, 18 Mar 2008 21:56:57 +0000 Subject: svn merge -r 82263:82563 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-2-Server --> release Sprinkle "--location" pixie dust into farm curl calls QAR-387 - pull in fix for missing abuse report snapshots (asset-id --> asset_id) / DEV-11758 comment --> template comment tweak by yoz for postcards QAR-351 - Event queuing modifications DEV-11639 - fix for llsdhttp.py to work with newer eventlet API Rotating log_text_message is now part of the cron jobs --- indra/newview/llviewerregion.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 88271aa7f6..12d461d0d7 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -950,6 +950,7 @@ void LLViewerRegion::updateCoarseLocations(LLMessageSystem* msg) { //llinfos << "CoarseLocationUpdate" << llendl; mMapAvatars.reset(); + mMapAvatarIDs.reset(); // only matters in a rare case but it's good to be safe. U8 x_pos = 0; U8 y_pos = 0; @@ -1382,7 +1383,6 @@ void LLViewerRegion::setSeedCapability(const std::string& url) capabilityNames.append("MapLayer"); capabilityNames.append("MapLayerGod"); capabilityNames.append("NewFileAgentInventory"); - capabilityNames.append("ParcelGodReserveForNewbie"); capabilityNames.append("ParcelPropertiesUpdate"); capabilityNames.append("ParcelVoiceInfoRequest"); capabilityNames.append("ProvisionVoiceAccountRequest"); -- cgit v1.2.3