1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426

QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)

1 files changed, 18 insertions, 5 deletions

diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 49f2256f61..32a9fc95b4 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -538,7 +538,7 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item)
 		{
 			mask |= LLInventoryObserver::LABEL;
 		}
-		old_item->copy(item);
+		old_item->copyViewerItem(item);
 		mask |= LLInventoryObserver::INTERNAL;
 	}
 	else
@@ -654,14 +654,14 @@ void LLInventoryModel::updateCategory(const LLViewerInventoryCategory* cat)
 		{
 			mask |= LLInventoryObserver::LABEL;
 		}
-		old_cat->copy(cat);
+		old_cat->copyViewerCategory(cat);
 		addChangedMask(mask, cat->getUUID());
 	}
 	else
 	{
 		// add this category
 		LLPointer<LLViewerInventoryCategory> new_cat = new LLViewerInventoryCategory(cat->getParentUUID());
-		new_cat->copy(cat);
+		new_cat->copyViewerCategory(cat);
 		addCategory(new_cat);
 
 		// make sure this category is correctly referenced by it's parent.
@@ -1158,7 +1158,13 @@ void LLInventoryModel::fetchDescendentsResponder::onClickRetry(S32 option, void*
 {
 	if (option == 0)
 	{
-		std::string url = gAgent.getRegion()->getCapability("FetchInventoryDescendents");
+		std::string url;
+
+		LLViewerRegion * agent_region = gAgent.getRegion();
+		if (agent_region)
+		{
+			url = agent_region->getCapability("FetchInventoryDescendents");
+		}
 
 		if (!url.empty()) //Capability found.  Build up LLSD and use it.
 		{
@@ -1351,7 +1357,14 @@ void LLInventoryModel::backgroundFetch(void*)
 	if (sBackgroundFetchActive)
 	{
 		//If we'll be using the capability, we'll be sending batches and the background thing isn't as important.
-		std::string url = gAgent.getRegion()->getCapability("FetchInventoryDescendents");   
+		std::string url;
+
+		LLViewerRegion * agent_region = gAgent.getRegion();
+		if (agent_region)
+		{
+			url = agent_region->getCapability("FetchInventoryDescendents");
+		}
+
 		if (!url.empty()) 
 		{
 			bulkFetch(url);