From bd3eb020806b81c8160d8a3825083803d688e130 Mon Sep 17 00:00:00 2001 From: Mobius Date: Sun, 28 Nov 2010 14:34:22 +0000 Subject: [PATCH 1/3] Pine 2 billboard brought inline with mesh value --- indra/newview/app_settings/trees.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/app_settings/trees.xml b/indra/newview/app_settings/trees.xml index 213ee85fc7..274b17377a 100644 --- a/indra/newview/app_settings/trees.xml +++ b/indra/newview/app_settings/trees.xml @@ -9,7 +9,7 @@ - + From 7f55a321685b00d13638467dc27a8cdfb4037eef Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Sun, 28 Nov 2010 10:41:03 -0600 Subject: [PATCH 2/3] Diagnostics for marking images missing. --- indra/newview/llviewertexture.cpp | 4 ++++ indra/newview/llviewertexturelist.cpp | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 6160510c0e..357cad12d5 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1875,6 +1875,9 @@ bool LLViewerFetchedTexture::updateFetch() if(mFullWidth > MAX_IMAGE_SIZE || mFullHeight > MAX_IMAGE_SIZE) { //discard all oversized textures. + llinfos << "Discarding oversized texture, width= " + << mFullWidth << ", height= " + << mFullHeight << llendl; destroyRawImage(); setIsMissingAsset(); mRawDiscardLevel = INVALID_DISCARD_LEVEL ; @@ -1905,6 +1908,7 @@ bool LLViewerFetchedTexture::updateFetch() // We finished but received no data if (current_discard < 0) { + llinfos << "Discarding image, no data received" << llendl; setIsMissingAsset(); desired_discard = -1; } diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 275dfaa996..8774b133d2 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -1304,7 +1304,7 @@ void LLViewerTextureList::receiveImagePacket(LLMessageSystem *msg, void **user_d } -// We've been that the asset server does not contain the requested image id. +// We've been told that the asset server does not contain the requested image id. // static void LLViewerTextureList::processImageNotInDatabase(LLMessageSystem *msg,void **user_data) { @@ -1315,6 +1315,7 @@ void LLViewerTextureList::processImageNotInDatabase(LLMessageSystem *msg,void ** LLViewerFetchedTexture* image = gTextureList.findImage( image_id ); if( image ) { + llinfos << "Discarding image not in asset database" << llendl; image->setIsMissingAsset(); } } From 7395ee6366167cefa63698ac5751174c5dd497f2 Mon Sep 17 00:00:00 2001 From: kadah Date: Mon, 29 Nov 2010 14:08:07 -0800 Subject: [PATCH 3/3] Renamed ParcelWL on feature table --- FIRESTORM-FEATURETABLE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FIRESTORM-FEATURETABLE.txt b/FIRESTORM-FEATURETABLE.txt index 293d158477..bcbc81216f 100644 --- a/FIRESTORM-FEATURETABLE.txt +++ b/FIRESTORM-FEATURETABLE.txt @@ -13,4 +13,4 @@ ViewerTagBroadcast LGPL LargeProfile LGPL ImprovedPrefs LGPL WindlightExtraSettings LGPL -WindlightServerProtocol LGPL +WindlightParcelSettings LGPL