Merge with tip

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 7f69ce9641..9a71e53441 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -371,7 +371,7 @@ void LLInventoryPanel::modelChanged(U32 mask)
 						// this object was probably moved, check its parent

 						if ((mask & LLInventoryObserver::STRUCTURE) != LLInventoryObserver::STRUCTURE)

 						{

-							llwarns << *id_it << " is in model and in view, but STRUCTURE flag not set" << llendl;

+							llwarns << *id_it << " is in model and in view, but STRUCTURE flag not set" << " for model (Name :" << model_item->getName() << " )" << llendl;

 						}

 

 						LLFolderViewFolder* new_parent = (LLFolderViewFolder*)mFolders->getItemByID(model_item->getParentUUID());

@@ -472,7 +472,7 @@ void LLInventoryPanel::buildNewViews(const LLUUID& id)
 			if (objectp->getType() <= LLAssetType::AT_NONE ||

 				objectp->getType() >= LLAssetType::AT_COUNT)

 			{

-				lldebugs << "LLInventoryPanel::buildNewViews called with invalid objectp->mType : " << 

+				llwarns << "LLInventoryPanel::buildNewViews called with invalid objectp->mType : " << 

 					((S32) objectp->getType()) << " name " << objectp->getName() << " UUID " << objectp->getUUID() << llendl;

 				return;

 			}