diff --git a/FIRESTORM-FEATURETABLE.txt b/FIRESTORM-FEATURETABLE.txt
index ccb00900f6..7c06723157 100644
--- a/FIRESTORM-FEATURETABLE.txt
+++ b/FIRESTORM-FEATURETABLE.txt
@@ -14,5 +14,5 @@ ViewerTagBroadcast LGPL
LargeProfile LGPL
ImprovedPrefs LGPL
WindlightExtraSettings LGPL
-WindlightParcelProtocol LGPL
UnifiedCommWindow LGPL
+WindlightParcelSettings LGPL
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 @@
-
+
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();
}
}